diff --git a/app-accessibility/brltty/brltty-4.5-r3.ebuild b/app-accessibility/brltty/brltty-4.5-r3.ebuild
index 061fdf93aed4..b43bc2ca3f88 100644
--- a/app-accessibility/brltty/brltty-4.5-r3.ebuild
+++ b/app-accessibility/brltty/brltty-4.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.7 2014/01/18 20:06:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.8 2014/01/19 10:17:26 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech
 		tcl X"
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
index 594466321b36..35e398d63358 100644
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@@ -1,4 +1 @@
-DIST speechd-el-0.4.tar.gz 131535 SHA256 a34e3093a788e948420965144f6f79fffbe15e64e611eb2a2278e9004199c5cd SHA512 6c144c464d94d9bc278b92097e893d473d4c5c64004a10cbf522a5cc20cb3a5ebc55fa5a5f40cd4b325567556bac4790b3f92bea02c25b0476221bc55bcb16c1 WHIRLPOOL 39ca8fc5cca7ec994ef0b8279365e8ddd6cce5ab2432ccf1b1ddd178f093443e9ce77b5d009dc1a3a5db5390801a0f9ea8178937d44c13474defb300a199db63
-DIST speechd-el-2.2.tar.gz 177968 SHA256 6d57638fb20ef09207bea02b5d6cd65834aa4bbaf9b1b24833ae43c883298657 SHA512 f444f9b553ecfad82218f8d41f9928ff990b55ebed99a9fedffa6ad6273bca87fff2e3464ed934db3d60088c69eb2ba0db61526aa32d8e831129ba4dc5243eaf WHIRLPOOL 9522191c06b055b711135932e603632dddedca1b39d67346eb01d4df92f7d8a84d7f650f6c4785dc2c9c39c3103a7f1782707893a8fe7b9f820b88b41fd61f4c
-DIST speechd-el-2.4.tar.gz 182959 SHA256 bccf6a26cdb6123001473b5a618dc658fef6630014eddaf12fde4b7628458fda SHA512 394c94c32a91ef8a4914b19b57060de42368842a0fb1470d3e478c9b22c591ac05e908490b7da91a279f0c09643e0581bdcc260d4b329b923b4a5b75ebf062bd WHIRLPOOL 34a5c482b9eb7ee52e7922ba7be3bce847152a2d40a864016e7b2926b604b2984ef0777d746db8c742e1eec75775b7be481e5b8594175e0951883e9a7b63fdff
 DIST speechd-el-2.5.tar.gz 183278 SHA256 1ec52b27248e1c68d3ac37bee78842f3e124dc78e63891a1b706519349e4824e SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f WHIRLPOOL 3063e34e19e239653455ebe51bbc0e2e8630c21d5bd2342a24e39c1c8d6a831bb595165611cfa9b441fb6e9ccab50d956b81e63bb4235a86a03464812ffbe4ac
diff --git a/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch b/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch
deleted file mode 100644
index 913e366598d3..000000000000
--- a/app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/speechd-braille.el b/speechd-braille.el
-index a79b24e..dfbae4b 100644
---- a/speechd-braille.el
-+++ b/speechd-braille.el
-@@ -116,9 +116,14 @@
- 
- (defclass speechd-braille-emu-driver (speechd-driver)
-   ((name :initform 'braille-emu)
--   (manager :initform (lambda () (speechd-braille--create-manager
--                                  #'speechd-braille--display)))
--   (priority :initform (lambda () speechd-default-text-priority))))
-+  (manager)
-+  (priority)))
-+
-+(defmethod initialize-instance :after
-+    ((this speechd-braille-emu-driver) slots)
-+  (progn
-+    (oset this priority speechd-default-text-priority)
-+    (oset this manager (speechd-braille--create-manager #'speechd-braille--display))))
- 
- (defmethod speechd-braille--make-message
-     ((driver speechd-braille-emu-driver) text cursor)
-diff --git a/speechd-brltty.el b/speechd-brltty.el
-index f6bf353..ec89d04 100644
---- a/speechd-brltty.el
-+++ b/speechd-brltty.el
-@@ -237,10 +237,14 @@ is not recommended to assign or call user commands here."
- 
- (defclass speechd-brltty-driver (speechd-braille-emu-driver)
-   ((name :initform 'brltty)
--   (manager :initform (lambda () (speechd-brltty--create-manager)))
-+   (manager)
-    (brltty-connection :initform 'uninitialized)
-    (brltty-last-try-time :initform 0)))
- 
-+(defmethod initialize-instance :after
-+    ((this speechd-brltty-driver) slots)
-+  (oset this manager (speechd-brltty--create-manager)))
-+
- (defmethod speechd-braille--make-message
-     ((driver speechd-brltty-driver) text message)
-   (list (speechd-brltty--connection driver) text message))
-diff --git a/speechd-out.el b/speechd-out.el
-index aa82f10..0a484e3 100644
---- a/speechd-out.el
-+++ b/speechd-out.el
-@@ -87,9 +87,14 @@
- 
- 
- (defclass speechd-driver ()
--  ((name :initform (error "Driver name not given") :initarg :name
-+  ((name :initarg :name
-          :reader speechd-driver.name)))
- 
-+(defmethod initialize-instance :after
-+    ((this speechd-driver) slots)
-+  (if (not (slot-boundp this 'name))
-+    (error "Driver name not given")))
-+
- (defun speechd-out-register-driver (driver)
-   (let ((class (class-of driver)))
-     (labels ((replace (list)
diff --git a/app-accessibility/speechd-el/speechd-el-0.4.ebuild b/app-accessibility/speechd-el/speechd-el-0.4.ebuild
deleted file mode 100644
index b4476c3d2939..000000000000
--- a/app-accessibility/speechd-el/speechd-el-0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-0.4.ebuild,v 1.7 2009/10/17 22:01:46 halcy0n Exp $
-
-inherit elisp-common
-
-DESCRIPTION="emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND=">=app-emacs/elib-1.0
-	app-accessibility/speech-dispatcher"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	insinto /usr/share/emacs/site-lisp/speechd-el
-	doins *.el
-	exeinto /usr/bin
-	doexe speechd-log-extractor
-	dodoc README EMACSPEAK
-}
-
-pkg_postinst() {
-	elog "Execute the following command from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-}
diff --git a/app-accessibility/speechd-el/speechd-el-2.2.ebuild b/app-accessibility/speechd-el/speechd-el-2.2.ebuild
deleted file mode 100644
index 449611a84678..000000000000
--- a/app-accessibility/speechd-el/speechd-el-2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.2.ebuild,v 1.3 2009/10/17 22:01:46 halcy0n Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND=">=app-emacs/cedet-1.0_pre4-r2
-	>=app-accessibility/speech-dispatcher-0.5"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	elisp-install ${PN} *.el
-	exeinto /usr/bin
-	doexe speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog '(autoload \''speechd-speak "speechd-speak" nil t)'
-	elog '(speechd-speak)'
-}
diff --git a/app-accessibility/speechd-el/speechd-el-2.4.ebuild b/app-accessibility/speechd-el/speechd-el-2.4.ebuild
deleted file mode 100644
index cd0ac0f0531f..000000000000
--- a/app-accessibility/speechd-el/speechd-el-2.4.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-accessibility/speechd-el/speechd-el-2.4.ebuild,v 1.3 2012/10/19 19:54:09 ago Exp $
-
-EAPI="4"
-NEED_EMACS=23
-inherit elisp eutils
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="brltty"
-
-DEPEND=""
-RDEPEND=">=app-accessibility/speech-dispatcher-0.7
-	brltty? ( app-accessibility/brltty )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-emacs23.patch
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	dobin speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
-	elog '(speechd-speak)'
-}
diff --git a/app-admin/checkrestart/checkrestart-0.47-r2.ebuild b/app-admin/checkrestart/checkrestart-0.47-r2.ebuild
index c53fffe91446..259732344cff 100644
--- a/app-admin/checkrestart/checkrestart-0.47-r2.ebuild
+++ b/app-admin/checkrestart/checkrestart-0.47-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/checkrestart/checkrestart-0.47-r2.ebuild,v 1.1 2011/12/12 22:54:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/checkrestart/checkrestart-0.47-r2.ebuild,v 1.2 2014/01/19 16:21:39 maekke Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://arcdraco.net/~dragon/${P}-sep.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild b/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild
index 5585a4cb0e20..0476d990a38a 100644
--- a/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild
+++ b/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild,v 1.9 2013/12/17 10:54:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild,v 1.10 2014/01/19 10:12:37 vapier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/eselect-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.3.8"
 
diff --git a/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
index 2bfeb6dfdc5a..f100498a21a5 100644
--- a/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild,v 1.9 2014/01/15 10:44:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild,v 1.10 2014/01/19 17:18:27 pacho Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-lib-bin-symlink-0.1.1
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
index 72b57159ba3e..0f914092fab0 100644
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild,v 1.8 2014/01/18 20:06:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild,v 1.9 2014/01/19 10:17:40 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-admin/eselect-python/eselect-python-20140115.ebuild b/app-admin/eselect-python/eselect-python-20140115.ebuild
index 786d7c38a1e8..f0b43b42bffd 100644
--- a/app-admin/eselect-python/eselect-python-20140115.ebuild
+++ b/app-admin/eselect-python/eselect-python-20140115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.1 2014/01/19 01:59:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.3 2014/01/19 15:59:11 floppym Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
@@ -22,12 +22,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND="sys-devel/autoconf"
-else
-	DEPEND=""
-fi
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	local ret=0
-	ebegin "Running 'eselect python update'"
-	eselect python update --python2 --if-unset || ret=1
-	eselect python update --python3 --if-unset || ret=1
-	eend ${ret}
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+	if has_version '=dev-lang/python-2*'; then
+		eselect python update --python2 --if-unset
+	fi
+	if has_version '=dev-lang/python-3*'; then
+		eselect python update --python3 --if-unset
+	fi
 }
diff --git a/app-admin/eselect-python/eselect-python-99999999.ebuild b/app-admin/eselect-python/eselect-python-99999999.ebuild
index ee02f9701e2b..112e043dd735 100644
--- a/app-admin/eselect-python/eselect-python-99999999.ebuild
+++ b/app-admin/eselect-python/eselect-python-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.11 2014/01/18 05:30:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.13 2014/01/19 15:59:11 floppym Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
@@ -22,12 +22,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND="sys-devel/autoconf"
-else
-	DEPEND=""
-fi
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	local ret=0
-	ebegin "Running 'eselect python update'"
-	eselect python update --python2 --if-unset || ret=1
-	eselect python update --python3 --if-unset || ret=1
-	eend ${ret}
+	if has_version 'dev-lang/python'; then
+		eselect python update --if-unset
+	fi
+	if has_version '=dev-lang/python-2*'; then
+		eselect python update --python2 --if-unset
+	fi
+	if has_version '=dev-lang/python-3*'; then
+		eselect python update --python3 --if-unset
+	fi
 }
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 1d053e29b45e..6520e348e31a 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,2 +1 @@
-DIST lib_users-0.5.tar.gz 12067 SHA256 2d884bb8b4298918185bb71173a86d337f7647252781a325472d41504b06a206 SHA512 ae7734aeab5048b55e7229afb960c97dad7f8dfa793661af2cddde7f9f88b39e500fdf532d0a03fef3a6bffd8622017a4182b0739d989474c51c5ef0284297ba WHIRLPOOL a2e1aed7b2cf5dfef6e780ff96496762497e597797c5422dd29b0ddaf4af1903d708abffad0c8d2a1dfb0c382254f046342224a0e79609a1ddccc8fd13064421
 DIST lib_users-0.6.tar.gz 13314 SHA256 127cacaf8e108e4254401976e376b7ef9520cabc21b7b469b5cce39dd794a2dd SHA512 9f13878a309e0f879630dd45e5a27601cffc6816eec8497026815e85873e60f4991f2d412b9c82985cbc3c9088bcd6b8cb5b06bc15bbd327cfc5b002644f3db0 WHIRLPOOL 36430733778872bb18b83258c5bfe1e13c187d96d336d49fdc237ceccde662a14fb53faf9c6317194c49a943a0c32bd147797f82fcbbac2ec5a7c5f37d94c276
diff --git a/app-admin/lib_users/lib_users-0.5.ebuild b/app-admin/lib_users/lib_users-0.5.ebuild
deleted file mode 100644
index 778cadafec2a..000000000000
--- a/app-admin/lib_users/lib_users-0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.5.ebuild,v 1.8 2013/08/09 15:44:41 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose )"
-RDEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	python_execute_nosetests -P .
-}
-
-src_install() {
-	newbin lib_users.py lib_users
-	dodoc README TODO
-}
diff --git a/app-admin/lib_users/lib_users-0.6.ebuild b/app-admin/lib_users/lib_users-0.6.ebuild
deleted file mode 100644
index ebbbc8454f50..000000000000
--- a/app-admin/lib_users/lib_users-0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.6.ebuild,v 1.7 2013/08/18 13:28:42 ago Exp $
-
-EAPI=5
-
-inherit python
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose )"
-RDEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	python_execute_nosetests -P .
-}
-
-src_install() {
-	newbin lib_users.py lib_users
-	dodoc README TODO
-}
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index 5b4fe439c1fa..faf271b991ec 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -1,2 +1 @@
-DIST python-updater-0.10.tar.bz2 9245 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520 SHA512 4e6ce62fef67bc7fd7738d15b49ddff5f0c5c202a197b783bc4ce78005134d0c541ef32e3591cb6523976b2d6a38441677e819905f127e7b25ec1c0f5bf9d68b WHIRLPOOL b68db0d05c03a6aa68f595d23ff072deafa67e1460350e71bac6a30465c4d60459ff6cef54a1bbc4c87711f5d20843aedb575c1248fd698478b23abfbef26eee
 DIST python-updater-0.11.tar.bz2 9355 SHA256 5c88b2a56febe67e783855a1c51c4c89637e948704834ad1f5d1b6e46cc4a7b8 SHA512 613d0b772faed65690b3999fb557f4414926f72f2f6084cf2e91c225a036df8c1a3c73e4fa6feac191cb7ac89035d3bcae9a6b23f479e2cf63d69bb8c57217fe WHIRLPOOL 9eab112192a3515e71d4971b89282d3f9725629af5b4db6a090d74f4c3dc9421dbfbc9c6c0393b3d6387d4926b1eb1bbc6291ac18ae31e86ecfeb37cfba68b14
diff --git a/app-admin/python-updater/python-updater-0.10-r2.ebuild b/app-admin/python-updater/python-updater-0.10-r2.ebuild
deleted file mode 100644
index 1f2a10afca0c..000000000000
--- a/app-admin/python-updater/python-updater-0.10-r2.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-admin/python-updater/python-updater-0.10-r2.ebuild,v 1.2 2012/04/26 14:54:37 aballier Exp $
-
-inherit eutils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit subversion
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-expand-aliases.patch
-	epatch "${FILESDIR}"/${P}-only-alias-sed-if-exists.patch
-}
-
-src_compile() {
-	if [[ "${PV}" == "9999" ]]; then
-		emake ${PN}.1 || die "Generation of man page failed"
-	fi
-}
-
-src_install() {
-	dosbin ${PN} || die "dosbin failed"
-	doman ${PN}.1 || die "doman failed"
-	dodoc AUTHORS || die "dodoc failed"
-}
diff --git a/app-admin/python-updater/python-updater-0.10.ebuild b/app-admin/python-updater/python-updater-0.10.ebuild
deleted file mode 100644
index 78be5c927b5c..000000000000
--- a/app-admin/python-updater/python-updater-0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10.ebuild,v 1.7 2012/03/02 22:08:06 ranger Exp $
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit subversion
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_compile() {
-	if [[ "${PV}" == "9999" ]]; then
-		emake ${PN}.1 || die "Generation of man page failed"
-	fi
-}
-
-src_install() {
-	dosbin ${PN} || die "dosbin failed"
-	doman ${PN}.1 || die "doman failed"
-	dodoc AUTHORS || die "dodoc failed"
-}
diff --git a/app-admin/python-updater/python-updater-0.11.ebuild b/app-admin/python-updater/python-updater-0.11.ebuild
index adbd5302a000..e913bf228542 100644
--- a/app-admin/python-updater/python-updater-0.11.ebuild
+++ b/app-admin/python-updater/python-updater-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.13 2014/01/18 05:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.14 2014/01/20 02:49:18 floppym Exp $
 
 EAPI=5
 
@@ -23,8 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+RDEPEND="|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
 
 src_compile() {
 	if [[ "${PV}" == "9999" ]]; then
diff --git a/app-admin/python-updater/python-updater-9999.ebuild b/app-admin/python-updater/python-updater-9999.ebuild
index d6c99901231a..3fb8dd6365d3 100644
--- a/app-admin/python-updater/python-updater-9999.ebuild
+++ b/app-admin/python-updater/python-updater-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.10 2014/01/18 05:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.11 2014/01/20 02:49:18 floppym Exp $
 
 EAPI=5
 
@@ -23,8 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+RDEPEND="|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
 
 src_compile() {
 	if [[ "${PV}" == "9999" ]]; then
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 3966a0db527e..0619de91bfc8 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -5,4 +5,5 @@ DIST setools-3.3.7-06-gentoo-patches.tar.gz 6081 SHA256 466241e8c59eb78d7ecbbbba
 DIST setools-3.3.7.tar.bz2 940657 SHA256 2bfa0918746bdcc910b16b26a51109a4ffd07404c306141ada584cb36e3c895a SHA512 ae45a8ae11a3b7952da61b6b4c51adbb6b1b7caa6b15fdbfa71f6f150b6bc55d2d918e9e7720f868b4f432a5df6ed35d63d53a1c7640f015d9fa9c415d6e6a21 WHIRLPOOL a524e948c804a268c5308c1b544552b295e954d98a6fbb606bce2bd3cf33d37ebd3a0805226396c70f03d895a9ab8403d9ceeef4dd0117097851bb2ebb7660a1
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 DIST setools-3.3.8-01-gentoo-patches.tar.gz 5798 SHA256 3b8fa933617e42f1fe857b2b8b9ae949ea01324f98f17837e988714562b076b8 SHA512 bcca3678b3f3a3abdbac2d05b1007329249e0dda4f84a9c40c3030cdf22f7815a47bcfa68d7c70836ec1b8b2cbfd8c370d7cd7d09c41b3d4983ec23d79468e56 WHIRLPOOL 5a6072e512754caf7af32a626b3213d6a543c51cc0ff67bbd9b3f6bb822a0b8e406f7e245c9d459be27e2d6ecef527633b889aface5bffc2e04cc15f881529bb
+DIST setools-3.3.8-02-gentoo-patches.tar.gz 6296 SHA256 d386e82ebc0070548a401756985854b79674d7b144076b28f4eaf37fccc0fa1a SHA512 d86ff65f23e54a659eeb2e91d71075e8667d972adcc698709c64f33a9702bb196ef0ded4b5d415f8e5b6a552bfddaaf52b42aa71fb21299f29ca2b7ae230adf1 WHIRLPOOL cd50fbd2f7732f447c224000cd2ebf30c17728217f2e0529d297a110e2ea016498b9bce3dc5209ab8e2cd5091e70e55fb85296bb818567ebe781df74d9aaddf5
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
diff --git a/app-admin/setools/setools-3.3.8-r3.ebuild b/app-admin/setools/setools-3.3.8-r3.ebuild
new file mode 100644
index 000000000000..c03d2a435a8c
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r3.ebuild,v 1.1 2014/01/19 20:36:55 swift Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+inherit autotools java-pkg-opt-2 python eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
+	http://dev.gentoo.org/~swift/patches/setools/${P}-02-gentoo-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		dev-lang/swig:1
+		>=virtual/jdk-1.4
+	)
+	python? ( dev-lang/swig:1 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	java? ( >=virtual/jre-1.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=dev-tcltk/bwidget-1.8
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	if use python; then
+		python_pkg_setup
+		PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+	fi
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Disable broken check for SWIG version.
+	sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+	# Use swig1.3
+	sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
+	# Fix build failure due to double __init__.py installation
+	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		# Python bindings are built/installed manually.
+		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+		# Make PYTHON_LDFLAGS replaceable during running `make`.
+		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+	done
+
+	# temporary work around bug #424581 until automake-1.12 is stable (then
+	# depend on it). Need to use MKDIR_P in the mean time for 1.12+.
+	has_version ">=sys-devel/automake-1.12.1" && { find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} +  || die; }
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--with-java-prefix=${JAVA_HOME} \
+		--disable-selinux-check \
+		--disable-bwidget-check \
+		$(use_enable python swig-python) \
+		$(use_enable java swig-java) \
+		$(use_enable X swig-tcl) \
+		$(use_enable X gui) \
+		$(use_enable debug)
+
+	# work around swig c99 issues.  it does not require
+	# c99 anyway.
+	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+	emake || die "Failed to build setools"
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_copy_sources ${dir}
+			building() {
+				emake \
+					SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+					PYTHON_LDFLAGS="$(python_get_library -l)" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)"
+			}
+			python_execute_function \
+				--action-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				building
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			installation() {
+				emake \
+					DESTDIR="${D}" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)" \
+					install
+			}
+			python_execute_function \
+				--action-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				installation
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize setools
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup setools
+	fi
+}
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 38017a97cdc6..ee9aef000905 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,5 +1,3 @@
-DIST dpkg_1.16.10.tar.xz 3703340 SHA256 aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2 SHA512 cd7b1159c2071f48f2e369e03b8a3d1f00366bcdabab2ef4c33700e8f3230db5c9991e5937331f7f66f616d2bb798efec12e572af5724e1c9809beb9d5ae627e WHIRLPOOL 5d54eedf2b90f35ea9ee7b5c1bdc6ddc2a3054c893cddb048598d85a6f6a5ea846879d5c1181432bffc0268b404408a6d2d40bce0cfd49784e5b6bca703bae44
-DIST dpkg_1.16.11.tar.xz 3788644 SHA256 fa053acbc1d7d3e28c6329c412a08812b971e84898d06efc7bfa36e6a1cbbd96 SHA512 767b34db7952ef9d1bcbda7569604dccfd9c17d07e0ab2b452703ffb5089e738d4fd0d4b335da5e2440bd00e8d11b69eeaab838ecd66dd398126a93b9c24e3da WHIRLPOOL e6cf94e90597f05f66ef5a90b6c5a9484b9a34933a3d9e2d952230dcbda49e4c1e61a58d2ee13facb4492d312e4f6b4fd80d625f1821f77bbc70e83bfabecde7
 DIST dpkg_1.16.12.tar.xz 3789016 SHA256 af96447758ecbfda51fc57d4b3bc3d208ad6393e71b91c9b52c6687697a208da SHA512 852c9cfeeac278564e605e5a5c4d77cb775ad20cf7fc52fa28c2a6192462ee28c32ecc2b5e434e5eec185deff5039d9fb1802cb4fe6d131b8fba7209f8462d44 WHIRLPOOL 08a415bf48bf91086285b8f71fb29fd3705ddcad85a440e6eab1528399e4d6ed0f59d977382c9daa401dbd4c172fa21a210115fc9af55124c73a628add2b3178
 DIST dpkg_1.17.4.tar.xz 3836352 SHA256 01cdc81c33e77c3d7c40df17e19171794542be7cf12e411381ffcaa8f87b1854 SHA512 5b87c4e8860979eb802df5dd7bd7fa6929d4090be2b546a0c936cecac168e7f94563dfe5848317fe930185b3701fd170df737ecf8d47143153f67f484f4f9480 WHIRLPOOL 93f33e90d87910ccdd9cd57dcde5f5bf2ca7f76de00cf16a7c405050d9c9d9f65329360da01600ef2f2ff8bbb5146cac9a88a2b45ca3f93d7b0d723636b20c3e
 DIST dpkg_1.17.5.tar.xz 3839224 SHA256 b7c465006bb87725cf0fbcf61bd04d9c31384a4a68e41a0aeadacac0eb63f23d SHA512 ec892f50748eb59e71c2d7ed3d8033ee42d1dd8909ac18ae7361714d632d02d3f9ca37fd0beb6f806f8db84920134f1deda7c4559d606daab8070209144dcf4d WHIRLPOOL 6007af93d97f95169b64bbf3b572a2b756ddcc67fd4ca7be25801019fcf04b407aadf4ee6daf8e36f79b38d36c2c5cddd3393ae63fc5695bfef6830af89a7d41
diff --git a/app-arch/dpkg/dpkg-1.16.10.ebuild b/app-arch/dpkg/dpkg-1.16.10.ebuild
deleted file mode 100644
index e7cdd8bc582c..000000000000
--- a/app-arch/dpkg/dpkg-1.16.10.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.10.ebuild,v 1.14 2013/07/02 07:41:42 ago Exp $
-
-EAPI=4
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 dselect nls test unicode zlib"
-
-LANGS="
-	ast bs ca cs da de dz el eo es et eu fr gl hu id it ja km ko ku lt mr nb ne
-	nl nn pa pl pt_BR pt ro ru sk sv th tl vi zh_CN zh_TW
-"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( app-text/po4a )
-	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-perl/DateTime-Format-DateParse
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-	)"
-REQUIRED_USE="dselect? ( nls )"
-
-src_prepare() {
-	# do not expect Debian's gzip --rsyncable extension
-	epatch "${FILESDIR}"/${PN}-1.16.4.2-gzip-rsyncable.patch
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	# this test depends on a Debian only gzip extension that adds --rsyncable
-	# which will therefore always fail on Gentoo. (bug #310847).
-	sed -i scripts/Makefile.am \
-		-e '/850_Dpkg_Compression.t/d' \
-		|| die "sed failed"
-
-	# test fails (bug #414095)
-	sed -i utils/Makefile.am \
-		-e '/^test_cases/d;/100_update_alternatives/d' || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable dselect) \
-		$(use_enable unicode) \
-		$(use_with bzip2 bz2) \
-		$(use_with zlib) \
-		${myconf} \
-		--disable-compiler-optimisations \
-		--disable-compiler-warnings \
-		--disable-linker-optimisations \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-selinux
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install
-	rm "${ED}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/dpkg/dpkg-1.16.11.ebuild b/app-arch/dpkg/dpkg-1.16.11.ebuild
deleted file mode 100644
index 338a19f2163e..000000000000
--- a/app-arch/dpkg/dpkg-1.16.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.11.ebuild,v 1.1 2013/09/28 13:55:18 jer Exp $
-
-EAPI=4
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 dselect nls test unicode zlib"
-
-LANGS="
-	ast bs ca cs da de dz el eo es et eu fr gl hu id it ja km ko ku lt mr nb ne
-	nl nn pa pl pt_BR pt ro ru sk sv th tl vi zh_CN zh_TW
-"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( app-text/po4a )
-	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-perl/DateTime-Format-DateParse
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-	)"
-REQUIRED_USE="dselect? ( nls )"
-
-src_prepare() {
-	# do not expect Debian's gzip --rsyncable extension
-	epatch "${FILESDIR}"/${PN}-1.16.4.2-gzip-rsyncable.patch
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	# this test depends on a Debian only gzip extension that adds --rsyncable
-	# which will therefore always fail on Gentoo. (bug #310847).
-	sed -i scripts/Makefile.am \
-		-e '/850_Dpkg_Compression.t/d' \
-		|| die "sed failed"
-
-	# test fails (bug #414095)
-	sed -i utils/Makefile.am \
-		-e '/^test_cases/d;/100_update_alternatives/d' || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable dselect) \
-		$(use_enable unicode) \
-		$(use_with bzip2 bz2) \
-		$(use_with zlib) \
-		${myconf} \
-		--disable-compiler-optimisations \
-		--disable-compiler-warnings \
-		--disable-linker-optimisations \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-selinux
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install
-	rm "${ED}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/lbzip2/lbzip2-2.3-r1.ebuild b/app-arch/lbzip2/lbzip2-2.3-r1.ebuild
index b3739750186f..b3e3293098a9 100644
--- a/app-arch/lbzip2/lbzip2-2.3-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.3-r1.ebuild,v 1.11 2014/01/18 20:06:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.3-r1.ebuild,v 1.12 2014/01/19 10:17:54 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/lzip/lzip-1.15.ebuild b/app-arch/lzip/lzip-1.15.ebuild
index d562c121ac6f..12767f0b11a8 100644
--- a/app-arch/lzip/lzip-1.15.ebuild
+++ b/app-arch/lzip/lzip-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.15.ebuild,v 1.7 2014/01/18 20:07:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.15.ebuild,v 1.8 2014/01/19 10:18:08 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86"
 
 src_configure() {
 	# not autotools-based
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
index 3c0b0353aca5..95a2b0672f3a 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild,v 1.1 2013/10/08 16:52:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild,v 1.2 2014/01/19 17:23:54 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/6" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/app-cdr/cdemu/cdemu-2.1.1.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild
index 51262d57a6d0..ff2df272c4c6 100644
--- a/app-cdr/cdemu/cdemu-2.1.1.ebuild
+++ b/app-cdr/cdemu/cdemu-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.2 2014/01/19 17:24:10 pacho Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="+cdemu-daemon"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
index f2c537b91e70..e854f09107bf 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.3 2014/01/19 01:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.4 2014/01/20 02:32:59 patrick Exp $
 
 EAPI=5
 
@@ -128,7 +128,7 @@ src_configure() {
 			"unsigned long int" "unsigned long long"
 			float double "long double" size_t ssize_t ptrdiff_t
 			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-            "char *" "unsigned char *"
+			"char *" "unsigned char *"
 		)
 		for t in "${types[@]}" ; do
 			var="ac_cv_sizeof_${t// /_}"
diff --git a/app-cdr/gcdemu/gcdemu-2.1.1.ebuild b/app-cdr/gcdemu/gcdemu-2.1.1.ebuild
index ee7a2771c09b..fe9aea5b677d 100644
--- a/app-cdr/gcdemu/gcdemu-2.1.1.ebuild
+++ b/app-cdr/gcdemu/gcdemu-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.1.1.ebuild,v 1.2 2014/01/19 17:24:27 pacho Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch b/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch
new file mode 100644
index 000000000000..e6d1921dc008
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch
@@ -0,0 +1,55 @@
+--- a/src/slave/kprop.c
++++ b/src/slave/kprop.c
+@@ -91,7 +91,7 @@ main(argc, argv)
+     int     argc;
+     char    **argv;
+ {
+-    int     fd, database_fd, database_size;
++    int     fd = -1, database_fd, database_size;
+     krb5_error_code retval;
+     krb5_context context;
+     krb5_creds *my_creds;
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -64,7 +64,7 @@
+     krb5_kt_list *list;
+     int idx;
+ {
+-    krb5_kt_list lp, prev;
++    krb5_kt_list lp, prev = NULL;
+     int i;
+ 
+     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
+--- a/src/lib/kadm5/alt_prof.c
++++ b/src/lib/kadm5/alt_prof.c
+@@ -164,7 +164,7 @@
+     char **values;
+     char *valp;
+     int idx;
+-    krb5_boolean val;
++    krb5_boolean val = 0;
+ 
+     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
+     if (kret)
+
+--- a/src/util/profile/prof_init.c
++++ b/src/util/profile/prof_init.c
+@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
+ {
+     errcode_t err;
+     void *cbdata;
+-    profile_t new_profile;
++    profile_t new_profile = NULL;
+ 
+     *ret_new_profile = NULL;
+ 
+--- a/src/tests/asn.1/trval.c	2013-04-12 12:51:36.000000000 -0500
++++ b/src/tests/asn.1/trval.c	2013-05-24 04:31:14.077036380 -0500
+@@ -404,7 +404,7 @@
+ {
+     int n;
+     int r = 0;
+-    int rlen2;
++    int rlen2 = 0;
+     int rlent;
+     int save_appl;
diff --git a/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch b/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
new file mode 100644
index 000000000000..8490e629a377
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch
@@ -0,0 +1,12 @@
+Bug #448778
+--- a/src/build-tools/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
++++ b/src/build-tools/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++	    -e 's#\$(LDFLAGS)##' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)##'`
+ 
diff --git a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
index 29a56595e7e1..086eb56a3747 100644
--- a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
+++ b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild,v 1.8 2014/01/18 19:57:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild,v 1.9 2014/01/19 10:14:22 ago Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="LGPL-3 MPL-1.1"
 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=""
 
 DEPEND=""
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index a7e6cbd553c4..66662d3f5104 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.22 2014/01/04 20:05:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.23 2014/01/19 16:57:21 ulm Exp $
 
 EAPI=5
 
@@ -31,7 +31,6 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/joe/joe-3.7-r2.ebuild b/app-editors/joe/joe-3.7-r2.ebuild
index 59fe4704043f..89dae31185a7 100644
--- a/app-editors/joe/joe-3.7-r2.ebuild
+++ b/app-editors/joe/joe-3.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r2.ebuild,v 1.6 2014/01/18 20:00:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r2.ebuild,v 1.7 2014/01/19 10:15:07 ago Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/app-editors/nvi/nvi-1.81.6-r4.ebuild b/app-editors/nvi/nvi-1.81.6-r4.ebuild
index 3cb164c53430..572776681f38 100644
--- a/app-editors/nvi/nvi-1.81.6-r4.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.6 2014/01/18 20:16:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.7 2014/01/19 10:29:36 ago Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="perl tcl unicode"
 
 CDEPEND="|| ( ${DBDEPENDS} )
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 3e836fbfb30d..6f59a37b71aa 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,7 +1,7 @@
-DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
 DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
 DIST libvirt-1.1.3.1.tar.gz 26595900 SHA256 00383e0beef1854610d8d47fd9347564b3654ce0e4a263e06b0de364a118c93e SHA512 59f79d0fc52ae0c9ae97bcc8fd90f799d6daf63c9a36d38738ec7d7392e630e39347f0c472b02434e83888b3ee0ab62d2b0b4eaa92eed3102ff36ca30f2598aa WHIRLPOOL 92be678e7ef84f9437bb91b1a621e6b35f9ce1383b945e466b4b864c0df1cfb95900da6267263bb1984663ea8e2b5b358bd516748a934835a87be822f5d27e90
+DIST libvirt-1.1.3.3.tar.gz 26611343 SHA256 81f3527b5e647d128af18b21ea924ffb4f8b6420fe87d19f09829af7b31982e9 SHA512 01fb1b70fc537cdb0986f09066df3af61ed3d949814c42438842e4ceb44e919a1a1a4f1d9e3d4adaab050fbcb4dffc218b1b9f7fbbae1d035a7c0edc2fc3f03e WHIRLPOOL cf5cc9d298deac77c7f6ff5a3a8edac8f63bdf93a423fefa8a4969fa0d03ec35864a7fd1894c4fd37daad731c018d3c0b7e55fe92321bbc3f106fb73728f1e8d
 DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
-DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
 DIST libvirt-1.2.0-36378d1a.tar.xz 5200 SHA256 1c1448051bad702eccd7a122496f7995427218152b65de12e3d418f7faaf6412 SHA512 4c01d90dc1e2c46ed65a61321887d1337ea2733dfda1361de9560bd5aba68ff51e425190bbe140893dd96f902111ed5be1ba9bc72a356abc0251f30fff645746 WHIRLPOOL f3778cfd56c0a0857607af1c301e3cf8a96ecf87b5ec85d23dbf98512692fd2bb428c923eab69234e6fdad95ed6e195bb01ebdd843df7a18e910e55bb6dccf82
 DIST libvirt-1.2.0.tar.gz 26916717 SHA256 a8e578ae7861db2ac5f454073293d2ef3229fd3f6c4f9029101763244db22ddd SHA512 834274b0249eb39439d21cd9b494fa2acbaee9e5337557b8d57977b483f3e5d00fd0a6743f8f4a02e826114c15d2468ab0c9385e4e4c9537abba18da3d8c5fa6 WHIRLPOOL 057a91ad4296710833721d3a7f9eff616755422462479709b72e5fe679ed8825c5bbfd47fde9f7abaf1e6f4104a680ad874c41bf9759cf45ac7d863061a38cd0
+DIST libvirt-1.2.1.tar.gz 27228694 SHA256 bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898 SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0 WHIRLPOOL 75c2a37b1101950474aad8931d999564ff575512d38c9e8d2cf989cef3ad7057853046b738b20bd77be80c1e6677319aea7227797ae95ce91512dc36bd05a142
diff --git a/app-emulation/libvirt/libvirt-1.0.5.6.ebuild b/app-emulation/libvirt/libvirt-1.0.5.6.ebuild
deleted file mode 100644
index 00b458ea4a6f..000000000000
--- a/app-emulation/libvirt/libvirt-1.0.5.6.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.6.ebuild,v 1.2 2013/10/25 18:10:42 cardoe Exp $
-
-EAPI=5
-
-#BACKPORTS=b8430867
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python user autotools linux-info systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt
-	dev-lang/perl
-	=dev-lang/python-2*"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}
diff --git a/app-emulation/libvirt/libvirt-1.1.3-r2.ebuild b/app-emulation/libvirt/libvirt-1.1.3.3.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-1.1.3-r2.ebuild
rename to app-emulation/libvirt/libvirt-1.1.3.3.ebuild
index 76c0d5bbbec7..45a31ca9043b 100644
--- a/app-emulation/libvirt/libvirt-1.1.3-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3-r2.ebuild,v 1.1 2013/10/25 20:06:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.3.ebuild,v 1.1 2014/01/19 21:42:08 cardoe Exp $
 
 EAPI=5
 
-BACKPORTS=062ad8b2
+#BACKPORTS=062ad8b2
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
 		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
 		${BACKPORTS:+
 			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
diff --git a/app-emulation/libvirt/libvirt-1.1.4.ebuild b/app-emulation/libvirt/libvirt-1.1.4.ebuild
deleted file mode 100644
index f699fe1ba9fc..000000000000
--- a/app-emulation/libvirt/libvirt-1.1.4.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.4.ebuild,v 1.2 2013/11/11 03:41:44 floppym Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	python? ( ${PYTHON_DEPS} )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~USER_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~SECURITYFS
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-pkg_setup() {
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	use python && python-single-r1_pkg_setup
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF} \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
-
-	keepdir /var/lib/libvirt/images
-
-	use python && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	dodir /etc/sysctl.d
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.0.ebuild b/app-emulation/libvirt/libvirt-1.2.1.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-1.2.0.ebuild
rename to app-emulation/libvirt/libvirt-1.2.1.ebuild
index 6141c0f5d57c..719b1795afea 100644
--- a/app-emulation/libvirt/libvirt-1.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.0.ebuild,v 1.2 2013/12/03 18:45:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.1.ebuild,v 1.1 2014/01/19 21:35:51 cardoe Exp $
 
 EAPI=5
 
diff --git a/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild
new file mode 100644
index 000000000000..e7098d4dfc2f
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild,v 1.1 2014/01/19 19:22:52 floppym Exp $
+
+EAPI=5
+
+inherit eutils multilib pam user versionator flag-o-matic systemd toolchain-funcs
+
+MY_PV="$(replace_version_separator 3 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X doc fuse icu modules pam +pic xinerama"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libdnet
+	sys-apps/ethtool
+	sys-process/procps
+	pam? ( 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 )
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	virtual/linux-sources
+	sys-apps/findutils
+"
+
+RDEPEND="${COMMON_DEPEND}
+	modules? ( app-emulation/open-vm-tools-kmod )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup vmware
+}
+
+src_prepare() {
+	# Do not filter out Werror
+	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
+	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
+}
+
+src_configure() {
+	# http://bugs.gentoo.org/402279
+	if has_version '>=sys-process/procps-3.3.2'; then
+		export CUSTOM_PROCPS_NAME=procps
+		export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
+	fi
+
+	local myeconfargs=(
+		--with-procps
+		--with-dnet
+		--without-kernel-modules
+		$(use_enable doc docs)
+		--docdir=/usr/share/doc/${PF}
+		$(use_with X x)
+		$(use_with X gtk2)
+		$(use_with X gtkmm)
+		$(use_with icu)
+		$(use_with pam)
+		$(use_with pic)
+		$(use_enable xinerama multimon)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	# Bugs 260878, 326761
+	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
+}
+
+src_install() {
+	default
+
+	rm "${D}"/etc/pam.d/vmtoolsd
+	pamd_mimic_system vmtoolsd auth account
+
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+	systemd_dounit "${FILESDIR}"/vmtoolsd.service
+
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
+
+	if use X;
+	then
+		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
+
+		dobin "${S}"/scripts/common/vmware-xdg-detect-de
+
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}/open-vm-tools.desktop"
+
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, please add the users to the 'vmware' group."
+	fi
+	elog "Add 'vmware-tools' service to the default runlevel."
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 289656c9c758..b69d2825f335 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,11 +1,7 @@
 DIST qemu-1.4.2-6b5934f9.tar.xz 3132 SHA256 76af332ea3a731d04d5d2d909c4372250a156993ca56046dc607a7d43caa747e SHA512 c74cc6c3485cc19809676e7dc796d9f1d5b3d12decf1f0c61a948504471ac85f8b488c1acd0400b02827b1ad6b9745a6b47317c284365122ca772a842852f27e WHIRLPOOL 50dd6e7eed3902547dfae6c6cd73505232ed8abafc523c7df7e65a02cf9b29b3e7a29f4ce286b157c027f82e198ef23dd44a83c6925204317c7bb4d6e350617b
 DIST qemu-1.4.2.tar.bz2 10416877 SHA256 acae6c92b740ff89c0e31eca23338d4abd733432e51b081017757579b30ecf90 SHA512 aa296b3d06321c81b32fdd2fdcdf07f3c377123f18eadca977335592b64a4f2417eea421fe417b57e468741f707bda31ba907364d762983393272997fdef8999 WHIRLPOOL 782f3c6d8776210450a0c0ac24942d8e1c41995aeb8e910add704f8f6d95ae3392ee942c6b661d4674367d0e443453c7f29356b2b4c71be4ffed54436f90de8a
-DIST qemu-1.5.2-e26b4ba6.tar.xz 21348 SHA256 877cc321b3bd5e30aaa7a481b359e16845ad731927a49df1fb2d5b0cfbfd0ad6 SHA512 1f015c5d9ca37475bddf9d474255b10ae3f03d01280270211deb1195a2ef288e6a1bbff9490cb4173a7af4b02787469278816fd5dee69d8e11d601b5a46b0e53 WHIRLPOOL 86a249c1339bb241a1534e5047bab696b8c26ad491eda073ee57ce1f9104df54ab7e251cd5ad9568a1381307b118029b7619bf689dec36f454d3f77f2f2f402a
-DIST qemu-1.5.2-fd9f079c.tar.xz 34768 SHA256 d4772e9ece1e4a633d122df622a7cb21b7b3765f23140bee17a0091438cee82b SHA512 5b490a43b34aaf8b61eb3b7def642b2c28884bcc543a3ad60ebc54c809f5cef23c74e92c95a35221268faea1408b10dbbac6f9dace52c0fe09a729e450ccb96b WHIRLPOOL 729ed05a6aadd2dce1d63ceef2331334c62440d62ee6920622ebf25cf691f02bdfba3a547596f744522040bd5fa3e3b5c42f318a5fe26fe36863e797764e6b98
-DIST qemu-1.5.2.tar.bz2 11932902 SHA256 f661147d190ab8432045058a660d810f13dc528fe7017ce578e9f2da2997a250 SHA512 cae47d34b99d3d3ded688b5a434ba69a377a838dddd367d10e4a71cd697305870c9671e4291490c0028b8143870b0998469e508cd28922fbebd8ea5f86f591b9 WHIRLPOOL bd5e8063c40e3e2fc43934e3649562f594f249002209bf09e05fda06155d423587d714862c8b55f9b2621f3ce20154f4e81b5c73df65ef2513ae824ae5bbcee9
 DIST qemu-1.5.3-25d93791.tar.xz 3136 SHA256 311bf6db68e37080a7cb3ea9bd573420b783dd2484ce62a936abba39e3b58446 SHA512 023df394a5dd76e7a0363b0cf994a41f18eac0b1e15ba5aca025dd73456d05535eef729ed6febec245c2f51aa10611366ee68175d80057ce6ab92a3a1c79a191 WHIRLPOOL e8e090eb5f425ba07de3bad58155558bf8aed5db3715e4a9dc8b0b3f0913c1fcbc6e727704e66f3979f57b86b0563efdd0462069ea3f0f7b37c001c564ec3d4f
 DIST qemu-1.5.3.tar.bz2 11932631 SHA256 39364ccbe82434c4eb8c25813896a1dce2db1977080d06ce13f96aa24ee2a601 SHA512 a14c7ec22cbf94fcc53ae5bc4d663dbcb1e29e14aac7bb2bd03f7ae1afdcf528c4198856db7aba32f0c84b5b9f583137fa4c0cf386a12c8f74c9c8d7825f1c52 WHIRLPOOL b793744e935922e58ff2528ed77ad416cbef086b259dec974f9b0c9aba08949cbe958e468d67ce4606baa66e236902e186f9679e27041fbddef506267d792b15
-DIST qemu-1.6.0-49bdd50f.tar.xz 3132 SHA256 b722c117c3998b90d63a01558ab009a40df6e5d7fc184b650cb581ae45594c17 SHA512 c3403958c6f4412f7656a161b1e065966893a4426f582fedf5350acb466b590349fbba3dcc5f52a3df023c7894ca7ee0bd5a3c41df7dc515c08d3dfbb838668d WHIRLPOOL fb99c0faac3052dd42f9f3d5bb87520974277831f41bb965a7dabb8ce7be83ea387522a44cbc8013f3d875d67d0ee7e86067887a341f8d7acb01efd6d47c63f0
 DIST qemu-1.6.0-4c9bed9d.tar.xz 25752 SHA256 c642e8574b43094c6a0be12617514709ca446f08f546a6528ca433af06748bd7 SHA512 6ea00f51c3f35d27050026d5e4418b15ac624c9e58eb35cff252c31d273a6159a299472c8662c50a28cdc3aaa5b4b5028369303a776353822904f72c1300377a WHIRLPOOL 056d10c2b33f416cb2077b94fd1904b708631c7e3885943a41adff26e773905d6df3a81acbe991fc6170456f2a8eabcd2abbc3ccd682dcb9cc055f6d21ac4b00
 DIST qemu-1.6.0.tar.bz2 12040196 SHA256 3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48 SHA512 18dfc35eeb6fa48c9e73483c905885ae98191cf76acc00c568d57c6973d912f8bea4de24e85f55308d22e74028b809349b00d7c531c3b2dd5c837cd213a8faac WHIRLPOOL bdf7611557876cf86e207153c6793132511f555940f9e5ad671e4294c3a738a85e9c84c678a7daf73b863a15c7223ba7e7f4fd36c68ee3d59b3beabd7d17930a
 DIST qemu-1.6.1-452f0d87.tar.xz 8884 SHA256 278e0bf4189949a5d31cc9ac549e286b657247284e5241c06146bf0629e45a1d SHA512 2b40f42b51e338f6d773d215b88626876213daa35c75201e027caa18cd5883826b42ba4c99c685ce57716ab8530aa0fa068cc53e372b6105aa6aba05f705efd4 WHIRLPOOL f062bfa28adbeea95ea4fb09fc4772d801a652766843aff3ab09113e20fe1fe507bbea11e910bf1828339e851b0e85e64ff6934605d0a6c12b275230759ec838
diff --git a/app-emulation/qemu/qemu-1.5.2-r1.ebuild b/app-emulation/qemu/qemu-1.5.2-r1.ebuild
deleted file mode 100644
index e7ead3dfb147..000000000000
--- a/app-emulation/qemu/qemu-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r1.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=e26b4ba6
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.6.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-1.5.2-r2.ebuild b/app-emulation/qemu/qemu-1.5.2-r2.ebuild
deleted file mode 100644
index 545ed6153469..000000000000
--- a/app-emulation/qemu/qemu-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r2.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=fd9f079c
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.6.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-1.6.0.ebuild b/app-emulation/qemu/qemu-1.6.0.ebuild
deleted file mode 100644
index 6565b8aec80d..000000000000
--- a/app-emulation/qemu/qemu-1.6.0.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.6.0.ebuild,v 1.4 2013/09/06 15:27:14 cardoe Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=49bdd50f
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.7.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-1.7.0.ebuild b/app-emulation/qemu/qemu-1.7.0.ebuild
index 545c1859a68c..5e97fd55564c 100644
--- a/app-emulation/qemu/qemu-1.7.0.ebuild
+++ b/app-emulation/qemu/qemu-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.7.0.ebuild,v 1.1 2013/12/19 08:49:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.7.0.ebuild,v 1.2 2014/01/19 23:04:58 cardoe Exp $
 
 EAPI=5
 
@@ -97,13 +97,13 @@ RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
 	qemu_softmmu_targets_i386? (
 		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
+		~sys-firmware/seabios-1.7.3.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
 	qemu_softmmu_targets_x86_64? (
 		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
+		~sys-firmware/seabios-1.7.3.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index fcbd3af67bb8..7e818bad852d 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,4 +1 @@
-DIST gentoo-0.19.13.tar.gz 1541738 SHA256 6afafeacd54a18d97e217ad10df1b555274ac856f050e10888109d405ebdc092 SHA512 51bffcc73a1c81697bed975169286afefc46f02b956da17985a5a4082188ffe155f0943d4cf0718c1097823e4f7d41399efda8309a5ecc6e2c02bd80adee4bac WHIRLPOOL be4d1fa32c814ecbfc2dc149931104c9c9d93b3e9491c4de5630ae737cc5f01f6b389e9a7a435b4423e9fc714aaa526782624b2739d8f80304618f05d1de1936
-DIST gentoo-0.20.1.tar.gz 1552672 SHA256 3f7a57681a2bade54a0096bdcaad1ff776bca51486fd42cb7518d33e29b3835f SHA512 30a7adf6c8987cb9b158545cc11f8b87691f4b85056d1b2653143055b53232a9a6bc2995b7f0d9c1f2b79350a03d57470c6b0656ab07ed72bcda29a7a86ca507 WHIRLPOOL a531a7b2c2d005be4157c3a7c0756b1dbb09e9a7416752a7156d35ffb03d5bb6a6e282daa5a456d078a6d4b9430945090288c9b4d4d4f06677f89a9df085131e
-DIST gentoo-0.20.3.tar.gz 1554789 SHA256 0d3f8cb103916ae3e86e5f01379634ab21568a312f77ba3f90cd3ce876170fb0 SHA512 d237a0ecb9d4efd8506518c3fa6b388509dcf890d742d539978f1e724e34efa71e77b2e0e117494832fe2c98052401540abf98311a7d30e2f573f07d5f41c1ba WHIRLPOOL 62daadb711b2506a0c200389a1ddc6ebc6e1e93b7880d1ef00f5c3995a00bb5e9509ccacc02c1ef0e232a2fb293566bedf45688123adb690bcd406eb539ca854
 DIST gentoo-0.20.4.tar.gz 1559764 SHA256 2993ceb7509c45db10e7f3d515389ede978b24d6cb9932a59588fd7c9923bc80 SHA512 841726987cbbd81a48dac9195ae41557c4af54fba0bad99c1346a52b6cc25129b245b431ea8b42b8e47d30ee783928857fc772acf6228809bdb86b7eb74eda31 WHIRLPOOL aaff175847753c2f712e044278ad6fd2e092e62ca7cdcfc41751adeaf31e8e9873ad469e8e9df2008ff857673ffe6db0d7cce6e4192d2679a392226801f44535
diff --git a/app-misc/gentoo/gentoo-0.19.13.ebuild b/app-misc/gentoo/gentoo-0.19.13.ebuild
deleted file mode 100644
index 4942ee5c0013..000000000000
--- a/app-misc/gentoo/gentoo-0.19.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.13.ebuild,v 1.8 2013/12/17 16:06:38 jer Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.24:2
-	>=dev-libs/glib-2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/ d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}
diff --git a/app-misc/gentoo/gentoo-0.20.1.ebuild b/app-misc/gentoo/gentoo-0.20.1.ebuild
deleted file mode 100644
index 7a93e9665a67..000000000000
--- a/app-misc/gentoo/gentoo-0.20.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.1.ebuild,v 1.10 2013/12/17 16:06:38 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/ d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}
diff --git a/app-misc/gentoo/gentoo-0.20.3.ebuild b/app-misc/gentoo/gentoo-0.20.3.ebuild
deleted file mode 100644
index 790bc492145b..000000000000
--- a/app-misc/gentoo/gentoo-0.20.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.3.ebuild,v 1.6 2013/12/21 16:36:56 ago Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}
diff --git a/app-misc/smtm/Manifest b/app-misc/smtm/Manifest
index 0a716f5ce547..35faf45a61b8 100644
--- a/app-misc/smtm/Manifest
+++ b/app-misc/smtm/Manifest
@@ -1,2 +1 @@
 DIST smtm_1.6.10.tar.gz 54033 SHA256 bad7fe5ebdf93db5e63855abe05cda739882f2d455aac4d25a5519e87935c825 SHA512 0cacafb8cfe1411b6b5db677bf15ad731b2e2181ee14ff8374e1fa01ad931e8f92efff29774e84950178f20805b18518067643e3c98d7990e1d1b93b7dd347d9 WHIRLPOOL 9c7b5254351adc44f994a07245056b88336b0ce08a4b35c7455794a7ff034314d45d24e6816d737ecf2152321c1ebfd347d6a69ef7604f39ebdb1c8fb6ec4a97
-DIST smtm_1.6.6.tar.gz 44325 SHA256 436c29508f12ac7190f5bb4a0a194853185eb8332230ac15f75f7bda88954ac3 SHA512 5bb18f449b3461c1b4f2ea2709963c697e2870a1d36aa1728fa2854f96e9213d67731aafeaaa79cff6ebb57ea468fd0bb31ba3f0f01dec512df7731fc20c27d7 WHIRLPOOL fd4226da373ffd879d4dcc971cae4c0445143012af36453335c7c3d1d60e28a308b7a539c5b8db2479053d9eafb438a4effd15c56d6e930a68a2c67bb66e1157
diff --git a/app-misc/smtm/smtm-1.6.10-r1.ebuild b/app-misc/smtm/smtm-1.6.10-r1.ebuild
index 4c937d5fd359..50f273f4436c 100644
--- a/app-misc/smtm/smtm-1.6.10-r1.ebuild
+++ b/app-misc/smtm/smtm-1.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10-r1.ebuild,v 1.2 2014/01/18 19:01:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10-r1.ebuild,v 1.4 2014/01/19 12:25:02 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 # This warrants USE examples
 IUSE=""
 
diff --git a/app-misc/smtm/smtm-1.6.6.ebuild b/app-misc/smtm/smtm-1.6.6.ebuild
deleted file mode 100644
index 4a4e3b9d2bff..000000000000
--- a/app-misc/smtm/smtm-1.6.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.6.ebuild,v 1.7 2012/03/18 15:36:02 armin76 Exp $
-
-inherit perl-app
-
-DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
-HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5
-	dev-perl/perl-tk
-	dev-perl/DateManip
-	dev-perl/HTML-Parser
-	dev-perl/Finance-YahooQuote
-	dev-perl/libwww-perl"
-
-mydoc="BUGS THANKS TODO examples/*"
diff --git a/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild b/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild
index 617fd2c5ae7e..7ec6b2a4cad6 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild,v 1.1 2013/11/30 23:42:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild,v 1.2 2014/01/19 11:03:23 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND="!app-office/koffice-l10n"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc"
 
 MY_LANGS="bs ca ca@valencia cs da de el es et fi fr gl hu ia it kk nb nds nl pl
diff --git a/app-office/calligra/calligra-2.6.4.ebuild b/app-office/calligra/calligra-2.6.4.ebuild
index c013f5ad075d..66f3d322dd0a 100644
--- a/app-office/calligra/calligra-2.6.4.ebuild
+++ b/app-office/calligra/calligra-2.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.6 2013/08/28 16:03:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.7 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -86,7 +86,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
diff --git a/app-office/calligra/calligra-2.7.5.ebuild b/app-office/calligra/calligra-2.7.5.ebuild
index b1d6ca7c67a6..66b4652666a5 100644
--- a/app-office/calligra/calligra-2.7.5.ebuild
+++ b/app-office/calligra/calligra-2.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.3 2013/12/31 08:46:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.5 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -40,7 +40,7 @@ SLOT="4"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
@@ -87,7 +87,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 81be5ad4ed94..1b7b9ea79038 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.42 2013/12/20 12:33:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.43 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -87,7 +87,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
diff --git a/app-office/orage/orage-4.10.0.ebuild b/app-office/orage/orage-4.10.0.ebuild
index 17a7ec8c0277..6f11ec411cda 100644
--- a/app-office/orage/orage-4.10.0.ebuild
+++ b/app-office/orage/orage-4.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.10.0.ebuild,v 1.3 2013/12/31 08:52:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.10.0.ebuild,v 1.4 2014/01/19 19:00:29 pacho Exp $
 
 EAPI=5
 inherit multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
 
 RDEPEND=">=dev-libs/libical-0.48:=
diff --git a/app-office/skrooge/skrooge-1.8.0.ebuild b/app-office/skrooge/skrooge-1.8.0.ebuild
index 2f64b74439d1..baec08396c35 100644
--- a/app-office/skrooge/skrooge-1.8.0.ebuild
+++ b/app-office/skrooge/skrooge-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.8.0.ebuild,v 1.3 2013/12/24 12:46:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.8.0.ebuild,v 1.4 2014/01/19 11:09:14 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-portage/metagen/metagen-0.6.2-r1.ebuild b/app-portage/metagen/metagen-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..60000c158f54
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.6.2-r1.ebuild,v 1.1 2014/01/20 03:46:53 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary"
+SRC_URI="http://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index ba3a9cf7b446..e6403e495597 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.4 2011/09/25 14:31:01 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.5 2014/01/20 03:46:53 floppym Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
-inherit distutils git-2
+inherit distutils-r1 git-r3
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary"
@@ -19,30 +17,20 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE=""
-DEPEND=">=dev-python/jaxml-3.01
-		>=sys-apps/portage-2.1.9.42"
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-src_install() {
-	distutils_src_install
-
-	metagen_install() {
-		local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py"
-		fperms 755 ${METAGEN_MOD}
-		dosym  "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}"
-	}
-	python_execute_function metagen_install
-
-	python_generate_wrapper_scripts "${ED}usr/bin/${PN}"
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
 
-	doman "docs/metagen.1"
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
 }
 
-src_test() {
-	einfo "Starting tests..."
-	testing() {
-		$(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()"
-	}
-	python_execute_function testing
-	einfo "Tests completed."
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
 }
diff --git a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild b/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
index 33bafac6f611..ee75fbb25221 100644
--- a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.14 2013/08/28 08:38:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.15 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=3
 inherit prefix
@@ -11,7 +11,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-shells/bash-completion/bash-completion-2.1-r1.ebuild b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
index 592629eae7ce..c7c551d1207d 100644
--- a/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r1.ebuild,v 1.6 2013/08/25 17:05:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r1.ebuild,v 1.7 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh )
diff --git a/app-shells/bash-completion/bash-completion-2.1.ebuild b/app-shells/bash-completion/bash-completion-2.1.ebuild
index 0ac07deeae62..3ff4bef6c792 100644
--- a/app-shells/bash-completion/bash-completion-2.1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.5 2013/08/28 08:38:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.6 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=5
 inherit prefix
@@ -11,7 +11,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 )
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild
index 8ec8fc2ca3ff..91d770ac7d4f 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild,v 1.10 2013/09/05 06:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild,v 1.11 2014/01/19 10:12:40 vapier Exp $
 
 EAPI=4
 inherit eutils prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash-completion"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild
index 85e10ebf3a48..eb1fc5dc660b 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild,v 1.3 2013/08/14 17:45:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild,v 1.4 2014/01/19 10:12:40 vapier Exp $
 
 EAPI="5"
 inherit bash-completion-r1 eutils prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}-r1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND=">=app-shells/bash-completion-2.1-r1"
diff --git a/app-shells/push/push-1.6.ebuild b/app-shells/push/push-1.6.ebuild
index 2480fab7a8ee..a256fab35d5f 100644
--- a/app-shells/push/push-1.6.ebuild
+++ b/app-shells/push/push-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/push/push-1.6.ebuild,v 1.8 2014/01/18 20:07:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/push/push-1.6.ebuild,v 1.9 2014/01/19 10:18:22 ago Exp $
 
 EAPI="4"
 inherit vcs-snapshot
@@ -11,7 +11,7 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index cd90e91301cf..37e0079a43ca 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.8 2014/01/18 20:07:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.9 2014/01/19 10:18:36 ago Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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="nls doc"
 RESTRICT="test"
 
diff --git a/app-text/discount/discount-2.1.6-r1.ebuild b/app-text/discount/discount-2.1.6-r1.ebuild
index 1a655ce2418f..7eb10e58032b 100644
--- a/app-text/discount/discount-2.1.6-r1.ebuild
+++ b/app-text/discount/discount-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.8 2013/11/24 19:00:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.9 2014/01/19 20:05:54 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/app-text/highlight/highlight-3.16.ebuild b/app-text/highlight/highlight-3.16.ebuild
index bc2c2248f87f..3eee204ce80f 100644
--- a/app-text/highlight/highlight-3.16.ebuild
+++ b/app-text/highlight/highlight-3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.16.ebuild,v 1.8 2014/01/18 20:08:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.16.ebuild,v 1.9 2014/01/19 10:18:51 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt4"
 
 RDEPEND="dev-lang/lua
diff --git a/app-text/llpp/llpp-15.ebuild b/app-text/llpp/llpp-15.ebuild
index a51458dc49b9..3a50a7cb25c7 100644
--- a/app-text/llpp/llpp-15.ebuild
+++ b/app-text/llpp/llpp-15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.10 2013/08/29 05:54:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.11 2014/01/19 08:51:00 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index 3ba03c3b498c..3a8457cf2601 100644
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.10 2013/07/17 15:53:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.11 2014/01/19 08:44:23 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
 
 LICENSE="AGPL-3"
 SLOT="0/1.2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla static static-libs"
 
 LIB_DEPEND="media-libs/freetype:2[static-libs?]
diff --git a/app-text/tofrodos/tofrodos-1.7.12a.ebuild b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
index 336203c027f6..4d30e95bcbf4 100644
--- a/app-text/tofrodos/tofrodos-1.7.12a.ebuild
+++ b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.12a.ebuild,v 1.1 2013/04/19 03:32:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.12a.ebuild,v 1.2 2014/01/20 07:57:31 heroxbd Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-db/lmdb/lmdb-0.9.11.ebuild b/dev-db/lmdb/lmdb-0.9.11.ebuild
index 4ee00a528991..c2e995f90007 100644
--- a/dev-db/lmdb/lmdb-0.9.11.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.1 2014/01/18 14:09:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.2 2014/01/19 11:46:29 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377e
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/pygresql/pygresql-4.1.1.ebuild b/dev-db/pygresql/pygresql-4.1.1.ebuild
index ed78c61b3fe8..50c1a4414f5a 100644
--- a/dev-db/pygresql/pygresql-4.1.1.ebuild
+++ b/dev-db/pygresql/pygresql-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1.ebuild,v 1.5 2014/01/17 20:40:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1.ebuild,v 1.6 2014/01/19 13:47:56 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="|| (
diff --git a/dev-db/sqlite/sqlite-3.8.2.ebuild b/dev-db/sqlite/sqlite-3.8.2.ebuild
index 4aacffc468fa..07f7f59d0813 100644
--- a/dev-db/sqlite/sqlite-3.8.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.2.ebuild,v 1.8 2014/01/18 20:19:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.2.ebuild,v 1.10 2014/01/19 10:33:27 ago Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/2013/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 
 RDEPEND="icu? ( dev-libs/icu:= )
diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild
index bd42172cd019..724ee0427911 100644
--- a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild
+++ b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild,v 1.6 2012/05/04 03:56:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild,v 1.7 2014/01/19 20:58:53 moult Exp $
 
 EAPI="2"
 
@@ -17,8 +17,7 @@ IUSE="doc"
 
 RDEPEND=">=dev-lang/mono-2.0
 	>=gnome-base/libgnome-keyring-2.30.0
-	dev-dotnet/glib-sharp
-	doc? ( virtual/monodoc )"
+	dev-dotnet/glib-sharp"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-haskell/alex/alex-3.1.2.ebuild b/dev-haskell/alex/alex-3.1.2.ebuild
index dbcd7bc0371e..37c90ae0c79a 100644
--- a/dev-haskell/alex/alex-3.1.2.ebuild
+++ b/dev-haskell/alex/alex-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.2.ebuild,v 1.5 2014/01/15 09:22:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.2.ebuild,v 1.6 2014/01/19 10:19:07 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
index c1c0ebd8e7c9..230fad161555 100644
--- a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:59:00 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:44:02 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/cereal/cereal-0.3.5.2.ebuild b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
index 63f9d71ab267..0fd8c40ff1e8 100644
--- a/dev-haskell/cereal/cereal-0.3.5.2.ebuild
+++ b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cereal/cereal-0.3.5.2.ebuild,v 1.8 2013/11/24 19:36:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cereal/cereal-0.3.5.2.ebuild,v 1.10 2014/01/19 10:44:15 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
index 2e9fd1106889..f9444290a775 100644
--- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
+++ b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.5 2014/01/15 09:23:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.6 2014/01/19 10:19:24 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?]
diff --git a/dev-haskell/dbus/dbus-0.10.4.ebuild b/dev-haskell/dbus/dbus-0.10.4.ebuild
index 165ddca46f07..23b0777f1fb3 100644
--- a/dev-haskell/dbus/dbus-0.10.4.ebuild
+++ b/dev-haskell/dbus/dbus-0.10.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dbus/dbus-0.10.4.ebuild,v 1.8 2013/12/07 19:31:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dbus/dbus-0.10.4.ebuild,v 1.10 2014/01/19 10:44:11 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
index 5e9507c806db..e38290e013b3 100644
--- a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.7 2014/01/15 09:23:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.8 2014/01/19 10:19:39 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/gio/gio-0.12.4-r1.ebuild b/dev-haskell/gio/gio-0.12.4-r1.ebuild
index 5c0e826a90ec..d1b598e0c012 100644
--- a/dev-haskell/gio/gio-0.12.4-r1.ebuild
+++ b/dev-haskell/gio/gio-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:59:55 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:59 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.12.0:0=[profile?]
diff --git a/dev-haskell/glib/glib-0.12.4-r1.ebuild b/dev-haskell/glib/glib-0.12.4-r1.ebuild
index 05c5b34c6f32..79a76efbda91 100644
--- a/dev-haskell/glib/glib-0.12.4-r1.ebuild
+++ b/dev-haskell/glib/glib-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.4 2013/12/12 06:03:43 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:56 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/gtk/gtk-0.12.4-r1.ebuild b/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
index 1fea940ec080..f02a0928e4cc 100644
--- a/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
+++ b/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:57:51 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:52 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="${GTK_MAJ_VER}/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+gio"
 
 RDEPEND=">=dev-haskell/cairo-0.12.0:0=[profile?]
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild
index 9af1bd11236c..7d5bc67289a1 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild,v 1.4 2013/12/12 06:05:04 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild,v 1.6 2014/01/19 10:43:45 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
index 347709cfc147..23556e4f3b73 100644
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild,v 1.3 2013/12/07 19:27:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild,v 1.5 2014/01/19 10:43:41 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="bounds-checking debug portable sse4_1 +unsafe-tricks"
 
 RDEPEND="dev-haskell/primitive:=[profile?]
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild
index bc2d6223e710..0c3c8d4f6050 100644
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild,v 1.3 2013/12/07 19:30:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild,v 1.5 2014/01/19 10:44:08 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/pango/pango-0.12.4-r1.ebuild b/dev-haskell/pango/pango-0.12.4-r1.ebuild
index 7f43c01de763..da43899e150c 100644
--- a/dev-haskell/pango/pango-0.12.4-r1.ebuild
+++ b/dev-haskell/pango/pango-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.4-r1.ebuild,v 1.4 2013/12/12 06:06:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:48 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cairo-0.12.0:0=[profile?]
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
index 734870e4aeb4..a7597010113d 100644
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild,v 1.8 2013/12/07 19:26:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild,v 1.10 2014/01/19 10:43:38 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
index dcb73a164943..f4299ef344b7 100644
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.2 2014/01/18 18:54:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.3 2014/01/19 10:19:54 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/vector/vector-0.10.0.1.ebuild b/dev-haskell/vector/vector-0.10.0.1.ebuild
index c18ab6a604aa..22e8338878ca 100644
--- a/dev-haskell/vector/vector-0.10.0.1.ebuild
+++ b/dev-haskell/vector/vector-0.10.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.4 2013/09/07 20:13:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.6 2014/01/19 09:39:57 slyfox Exp $
 
 EAPI=5
 
@@ -18,8 +18,22 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?]
-		<dev-haskell/primitive-0.6:=[profile?]
-		>=dev-lang/ghc-6.12.3:="
+RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
+		>=dev-lang/ghc-6.12.3:=
+		ppc? ( >=dev-lang/ghc-7.6.1 )
+"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
diff --git a/dev-haskell/vector/vector-0.10.9.1.ebuild b/dev-haskell/vector/vector-0.10.9.1.ebuild
index b67f106496ae..7be1b55339b0 100644
--- a/dev-haskell/vector/vector-0.10.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.10.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.1 2013/10/19 12:53:20 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.3 2014/01/19 09:39:57 slyfox Exp $
 
 EAPI=5
 
@@ -21,11 +21,25 @@ IUSE="+boundschecks internalchecks unsafechecks"
 RDEPEND=">=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?]
 	>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
 	>=dev-lang/ghc-6.10.4:=
+	ppc? ( >=dev-lang/ghc-7.6.1 )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0.3
 "
 
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag boundschecks boundschecks) \
diff --git a/dev-haskell/vector/vector-0.9.1.ebuild b/dev-haskell/vector/vector-0.9.1.ebuild
index bd8ebc69a661..081597b46754 100644
--- a/dev-haskell/vector/vector-0.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.8 2012/12/10 21:53:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.9 2014/01/19 08:26:34 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -22,3 +22,16 @@ RDEPEND="=dev-haskell/primitive-0.4*[profile?]
 		>=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
diff --git a/dev-haskell/xml-types/xml-types-0.3.4.ebuild b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
index c4284930973b..c2274104c613 100644
--- a/dev-haskell/xml-types/xml-types-0.3.4.ebuild
+++ b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.4.ebuild,v 1.3 2013/12/07 19:29:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.4.ebuild,v 1.5 2014/01/19 10:44:05 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/deepseq-1.1.0.0:=[profile?]
diff --git a/dev-java/asm/asm-3.3.1.ebuild b/dev-java/asm/asm-3.3.1.ebuild
index eb08ed996b89..bdbf259e7044 100644
--- a/dev-java/asm/asm-3.3.1.ebuild
+++ b/dev-java/asm/asm-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.6 2013/12/24 12:55:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.7 2014/01/19 10:16:22 ago Exp $
 
 WANT_ANT_TASKS="ant-owanttask"
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 IUSE=""
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
index caa489a66c94..9a41e291cb3a 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild,v 1.2 2014/01/18 18:56:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild,v 1.3 2014/01/19 10:13:03 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-lang/perl/perl-5.16.3.ebuild b/dev-lang/perl/perl-5.16.3.ebuild
index 1ec2e220b44a..fc13c707dc43 100644
--- a/dev-lang/perl/perl-5.16.3.ebuild
+++ b/dev-lang/perl/perl-5.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.16.3.ebuild,v 1.12 2014/01/16 19:51:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.16.3.ebuild,v 1.14 2014/01/20 05:00:28 zlogene Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~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="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/perl/perl-5.18.1.ebuild b/dev-lang/perl/perl-5.18.1.ebuild
index 0d88fe23fd50..b16fa128589d 100644
--- a/dev-lang/perl/perl-5.18.1.ebuild
+++ b/dev-lang/perl/perl-5.18.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.18.1.ebuild,v 1.1 2013/08/14 03:49:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.18.1.ebuild,v 1.2 2014/01/19 19:51:31 vapier Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/python/python-3.3.3.ebuild b/dev-lang/python/python-3.3.3.ebuild
index 56bcdde86921..67034b7ae3dd 100644
--- a/dev-lang/python/python-3.3.3.ebuild
+++ b/dev-lang/python/python-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.10 2014/01/18 20:19:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.12 2014/01/19 12:34:50 maekke Exp $
 
 EAPI="4"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.3"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 50a7569e3855..c046ab03a2e0 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,5 +1,3 @@
-DIST tcl-core8.6.0-src.tar.gz 5719946 SHA256 c53915996bb3ddda05d765f848bbd55111d44b74406a9b67a02070078a645964 SHA512 c5f78b80d9c83ac7dfd4dd05e54d8e678e5968df3cbd39d450e6923cdf370c17cdf0654580c649f4876d26cd527f965f0cecd2034cc6bc44d29a3579bc1d181f WHIRLPOOL 842f2ae04d5083cb78ffe04bafa6c132c135bb689d6609a3bbe5955492f1853692e20ff1b44bea81c1920022ef2dfa4397f69380befc8c911f51c05a76fd23a0
 DIST tcl-core8.6.1-src.tar.gz 5773335 SHA256 00a25fcd70e0be65f85e996353c2a0717eaaf51dc547cf6e499bb05257e20764 SHA512 d3f4c3200017f3afcc50c19619d79a31cac5441b4aac341524a6dfdda3e6f2eada1e0a70875d24f29afc733998aedf6fa14826cba61fceda496aaf2a2a4a3c5b WHIRLPOOL dbd53216ee28bb9a3fbaa7aa5c07ca5931f098d6761eaa859d74ab5dda409e6dc77a28ee43a312267ceff74d04fb723484b6ea8afccf429c28cea5fd6c64521e
 DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
-DIST tcl8.5.14-src.tar.gz 4528533 SHA256 7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d SHA512 3cc8a39d2f5d7bd086c041e11aeb3c7b755c943fa0f761a1f38ce6d625d7be557792352878b514d817628a57392604e401bd598bbf5a395deffda078b294ae8d WHIRLPOOL 99a5430f6f0375be2489344e0b1cef7c2f2cbc1f4c23087d3419588f9d71dd5018e0b0aeea63286e0fb0fa4c404e9c4b2b59bae4fb3e9ebe0ff8597615d89843
 DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e SHA512 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df WHIRLPOOL da369146ccc1a449eae6b2fddc7802457c267b1ed047dba665b2684f27105a0763646b6a985e697891b3da9b3531a89f1ffb78168dc386c27889bcdaaa175e1c
diff --git a/dev-lang/tcl/tcl-8.5.13-r1.ebuild b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
index 6a25781c2cc6..6513b5a85fcf 100644
--- a/dev-lang/tcl/tcl-8.5.13-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.12 2013/02/24 17:47:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.15 2014/01/20 07:34:30 jlec Exp $
 
 EAPI=4
 
@@ -14,24 +14,12 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
 
-pkg_setup() {
-	if use threads ; then
-		echo
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		echo
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-multilib.patch
 
@@ -50,6 +38,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
 	econf \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
diff --git a/dev-lang/tcl/tcl-8.5.14.ebuild b/dev-lang/tcl/tcl-8.5.14.ebuild
deleted file mode 100644
index 5dd49f32c392..000000000000
--- a/dev-lang/tcl/tcl-8.5.14.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.14.ebuild,v 1.1 2013/05/01 11:09:55 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-pkg_setup() {
-	if use threads ; then
-		echo
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		echo
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${P}-conf.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.5 ${version}; then
-			echo
-			ewarn "You're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.5.15-r1.ebuild b/dev-lang/tcl/tcl-8.5.15-r1.ebuild
index 1fb922b8fe57..631645523679 100644
--- a/dev-lang/tcl/tcl-8.5.15-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild,v 1.2 2013/12/28 18:28:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild,v 1.5 2014/01/20 07:34:30 jlec Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
@@ -23,18 +23,6 @@ DEPEND="${RDEPEND}"
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
 
-pkg_setup() {
-	if use threads ; then
-		echo
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		echo
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
@@ -54,6 +42,14 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
 	econf \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
diff --git a/dev-lang/tcl/tcl-8.5.15.ebuild b/dev-lang/tcl/tcl-8.5.15.ebuild
deleted file mode 100644
index 1fce3a402a5b..000000000000
--- a/dev-lang/tcl/tcl-8.5.15.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15.ebuild,v 1.1 2013/09/25 14:57:41 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-pkg_setup() {
-	if use threads ; then
-		echo
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		echo
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.5 ${version}; then
-			echo
-			ewarn "You're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.6.0-r1.ebuild b/dev-lang/tcl/tcl-8.6.0-r1.ebuild
deleted file mode 100644
index f0c4deecb5db..000000000000
--- a/dev-lang/tcl/tcl-8.6.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.0-r1.ebuild,v 1.5 2013/02/25 21:39:15 zmedico Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.13-conf.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-lang/tcl/tcl-8.6.1-r1.ebuild b/dev-lang/tcl/tcl-8.6.1-r1.ebuild
index 26e3df436c39..2a9ee0dfa23e 100644
--- a/dev-lang/tcl/tcl-8.6.1-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild,v 1.2 2013/12/28 18:28:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild,v 1.4 2014/01/19 09:51:31 vapier Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug +threads"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
@@ -52,6 +52,14 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
 	econf \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
diff --git a/dev-lang/tcl/tcl-8.6.1.ebuild b/dev-lang/tcl/tcl-8.6.1.ebuild
deleted file mode 100644
index 11c28c661dca..000000000000
--- a/dev-lang/tcl/tcl-8.6.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1.ebuild,v 1.1 2013/09/25 14:57:41 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +threads"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-	find \
-		"${SPARENT}"/compat/* \
-		"${SPARENT}"/doc/try.n \
-		-delete || die
-
-	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${P}-conf.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	# workaround stack check issues, bug #280934
-	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
-
-	tc-export CC
-
-	sed \
-		-e 's:-O[2s]\?::g' \
-		-i tcl.m4 || die
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
-		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
-
-pkg_postinst() {
-	for version in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 8.6 ${version}; then
-			echo
-			ewarn "You're upgrading from <${P}, you must recompile the other"
-			ewarn "packages on your system that link with tcl after the upgrade"
-			ewarn "completes. To perform this action, please run revdep-rebuild"
-			ewarn "in package app-portage/gentoolkit."
-			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-			ewarn "upgrade them before this recompilation, too,"
-			echo
-		fi
-	done
-}
diff --git a/dev-libs/check/check-0.9.10.ebuild b/dev-libs/check/check-0.9.10.ebuild
index 46f0768aaac2..590643c9a178 100644
--- a/dev-libs/check/check-0.9.10.ebuild
+++ b/dev-libs/check/check-0.9.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.10.ebuild,v 1.1 2013/04/24 07:18:22 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.10.ebuild,v 1.2 2014/01/20 07:07:13 vapier Exp $
 
 EAPI=4
 inherit autotools autotools-utils eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/check/check-0.9.11.ebuild b/dev-libs/check/check-0.9.11.ebuild
index cc2ff1fcea9a..18cfd457ffb8 100644
--- a/dev-libs/check/check-0.9.11.ebuild
+++ b/dev-libs/check/check-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.11.ebuild,v 1.2 2014/01/03 04:35:30 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.11.ebuild,v 1.3 2014/01/20 07:07:13 vapier Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/check/check-0.9.8-r1.ebuild b/dev-libs/check/check-0.9.8-r1.ebuild
index 3f528a21ff28..ae309a402884 100644
--- a/dev-libs/check/check-0.9.8-r1.ebuild
+++ b/dev-libs/check/check-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.8-r1.ebuild,v 1.12 2012/08/20 03:12:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.8-r1.ebuild,v 1.13 2014/01/20 07:07:14 vapier Exp $
 
 EAPI=4
 inherit autotools autotools-utils eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 arm64 hppa ia64 m68k ~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="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/check/check-0.9.9.ebuild b/dev-libs/check/check-0.9.9.ebuild
index 62e468a1ef07..b799a8db9cf3 100644
--- a/dev-libs/check/check-0.9.9.ebuild
+++ b/dev-libs/check/check-0.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.9.ebuild,v 1.1 2012/10/23 00:09:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.9.ebuild,v 1.2 2014/01/20 07:07:13 vapier Exp $
 
 EAPI=4
 inherit autotools autotools-utils eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/gmime/gmime-2.6.19-r1.ebuild b/dev-libs/gmime/gmime-2.6.19-r1.ebuild
index ccb34df1dcc0..577fd94273b6 100644
--- a/dev-libs/gmime/gmime-2.6.19-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.6.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.19-r1.ebuild,v 1.8 2014/01/18 20:17:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.19-r1.ebuild,v 1.9 2014/01/19 10:30:35 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mono static-libs vala"
 
 RDEPEND="
diff --git a/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild b/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild
index 6a952d5aa0c1..7b591fb11a4b 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild,v 1.2 2013/10/31 19:48:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild,v 1.3 2014/01/19 11:30:36 pacho Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ SRC_URI="http://public.callutheran.edu/~abarker/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc static-libs X"
 
 # S is only needed for the pre_package
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild
index 23ec102f8d5e..838ded71ccfa 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild,v 1.3 2013/10/22 21:28:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1.ebuild,v 1.4 2014/01/19 17:22:20 pacho Exp $
 
 EAPI=5
 MY_P=${PN}-10.2+${PV/_p/+}
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-admin/eselect-cdparanoia
diff --git a/dev-libs/libcdio/libcdio-0.90-r1.ebuild b/dev-libs/libcdio/libcdio-0.90-r1.ebuild
index cae8609b986c..dd403ebc89e2 100644
--- a/dev-libs/libcdio/libcdio-0.90-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.90-r1.ebuild,v 1.9 2014/01/15 10:44:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.90-r1.ebuild,v 1.10 2014/01/19 17:18:52 pacho Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libmirage/libmirage-2.1.1.ebuild b/dev-libs/libmirage/libmirage-2.1.1.ebuild
index 50dd60228211..549c8a04e59a 100644
--- a/dev-libs/libmirage/libmirage-2.1.1.ebuild
+++ b/dev-libs/libmirage/libmirage-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.1.ebuild,v 1.1 2013/10/08 16:51:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.1.ebuild,v 1.2 2014/01/19 17:23:38 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/9" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
index 0949edf4b927..de8a6e8d1f56 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.17 2012/07/15 18:17:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.18 2014/01/19 10:09:39 vapier Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc python"
 
 RDEPEND="python? ( >=dev-lang/python-2.3 )
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mini-xml/Manifest
index 7e166276394b..c9dd5a196127 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1 +1,2 @@
 DIST mxml-2.7.tar.gz 262027 SHA256 a77200ee4c1e1cf2eb531595ec17ce31805760699d260915496c39d3388eb803 SHA512 9fac34975c35d0ff9686a20a882824040b0b96b38ab9f1f5b1ef24a323668974860d4d977bb07c90a3e2b3410a2d8358eec1682b2c7ff2cda7f36f630ff97007 WHIRLPOOL 1c899377e69f2763e9502d60e957aa0318710f45b57ebc2099090e8439d27f7024bdeaa59042edf202aa1579f81d3e6296f7718dd7bc34faf346967ad6b05d64
+DIST mxml-2.8.tar.gz 264044 SHA256 0c9369f91a718d82e32cb007c0bd41b6642822c9a0ffe1d10eccbdea9a3011d5 SHA512 f6ecb9edfe9917137b47b41be941b22c1054b38e7f2e16977a0e9dfa554f2e62886fc65ac404e4445f10fba7c6dbb30a235525cccba75c9daf3da4ba251cf3bd WHIRLPOOL ab3c058f63820d19dfe6a359552a61ad5c18a73aa9f8fb728a2524e8ddde5dcc9843cd8aab2c07ba1649e3ca92a705856c11d4dabfb6f345360cf086f924e2d1
diff --git a/dev-libs/mini-xml/mini-xml-2.8.ebuild b/dev-libs/mini-xml/mini-xml-2.8.ebuild
new file mode 100644
index 000000000000..7c06bf462e44
--- /dev/null
+++ b/dev-libs/mini-xml/mini-xml-2.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.8.ebuild,v 1.1 2014/01/20 09:01:12 polynomial-c Exp $
+
+EAPI=5
+
+inherit autotools multilib
+
+MY_P="${P/mini-xml/mxml}"
+
+DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
+HOMEPAGE="http://www.minixml.org/"
+SRC_URI="http://www.msweet.org/files/project3/${MY_P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="threads static-libs"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e "s:755 -s:755:" \
+		-e "/^TARGETS/s: testmxml::" \
+		-e 's:$(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS):$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.5 $(LIBOBJS):' \
+			-i Makefile.in || die "sed failed"
+	sed -i -e 's:OPTIM="-Os -g":OPTIM="":' configure.in || die "sed failed"
+	rm configure
+#	eautoreconf
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--libdir="/usr/$(get_libdir)" \
+		--with-docdir="/usr/share/doc/${PF}/html" \
+		$(use_enable threads)
+}
+
+src_compile() {
+	emake libmxml.so.1.5 mxmldoc doc/mxml.man
+}
+
+src_install() {
+	emake DSTROOT="${D}" install
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/libmxml.a || die
+	fi
+
+	dodoc ANNOUNCEMENT CHANGES README
+	rm "${D}/usr/share/doc/${PF}/html/"{CHANGES,COPYING,README} || die
+}
+
+src_test() {
+	emake testmxml
+}
diff --git a/dev-libs/nss/nss-3.15.4.ebuild b/dev-libs/nss/nss-3.15.4.ebuild
index 76f99ac75770..8db20ca1a483 100644
--- a/dev-libs/nss/nss-3.15.4.ebuild
+++ b/dev-libs/nss/nss-3.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.4.ebuild,v 1.6 2014/01/17 20:47:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.4.ebuild,v 1.8 2014/01/19 13:55:24 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/openssl/openssl-1.0.1f.ebuild b/dev-libs/openssl/openssl-1.0.1f.ebuild
index afd1252509b4..bd33beac030c 100644
--- a/dev-libs/openssl/openssl-1.0.1f.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1f.ebuild,v 1.6 2014/01/18 19:08:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1f.ebuild,v 1.8 2014/01/19 13:48:03 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild
index a1bd761a4989..75f797c0e9f0 100644
--- a/dev-libs/protobuf/protobuf-2.5.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.8 2014/01/16 20:17:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.9 2014/01/19 10:30:49 ago Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0/8" # subslot = soname major version
-KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax"
 
 CDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/vc/vc-0.7.2.ebuild b/dev-libs/vc/vc-0.7.2.ebuild
index 191793e4a906..f7c008e15a13 100644
--- a/dev-libs/vc/vc-0.7.2.ebuild
+++ b/dev-libs/vc/vc-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vc/vc-0.7.2.ebuild,v 1.1 2013/09/14 13:13:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vc/vc-0.7.2.ebuild,v 1.2 2014/01/19 11:03:06 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI+=" https://gitorious.org/${PN}/${PN}/archive-tarball/${PV} -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 src_unpack() {
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
index 19947661343d..6846b1c36691 100644
--- a/dev-ml/async/Manifest
+++ b/dev-ml/async/Manifest
@@ -1,2 +1,3 @@
 DIST async-109.35.00.tar.gz 72648 SHA256 24b35c2e69dabbfdf5f0d7532dba9348dbe7f95df6cb82d5d8573a37a6333ef7 SHA512 f04e09bdeda5058f2f91b1f4efce7f8322fa05c8b91b771769a8b103f9369a079167016cec7a8562af9f9848944aad0f70a0277f26d6282c80ad45cbe39a8b65 WHIRLPOOL 33bfa264750c7d78b535877a606c1770eeba08dc1e9c6dcdc65da26fcc3605e53d41d5e3d171bc81929aa33e4e759356b6d9e833ee5ac03b59097e478fda3f38
 DIST async-109.38.00.tar.gz 72857 SHA256 e62e3952fb6641e03fbf1b05609c849096f2017c35a1239eeec5c3d6e0c49ed2 SHA512 5bf928321b4d907dc829c6d7aaca74c7e1ef6934bfef5f0a034d3f553927f946a1d978d68657336b603379feb34c67da5edacaaaf0128a40284b3fa88efe3780 WHIRLPOOL 28ac0c198fdba58f5984741a8866464702378da10883856e9908ee635d80d494d4e4c25316506b7214e99ffa1be5c02191ddcfde2b5f923390ab30faef0d8b7b
+DIST async-109.60.00.tar.gz 78650 SHA256 1ae33e8fd939806e58b54769c936597e98c54afa0e74183f8b3a61be10ca1f6a SHA512 8ec597e14faa63c467fc14778c8a8d00a7b33661397e73b1841580484b0760c82f691bff189128820b08fafe3d572797d4fe742eb0920b5c90b9feaa190356ab WHIRLPOOL c359a706b0b524ce5cc27cff780b583c2c7a43e452996adf5a19ac56dde148c1d3a98d3968df60ea6abdd2fae5af2c018c469b346905f41bb98ea2148d339fe4
diff --git a/dev-ml/async/async-109.60.00.ebuild b/dev-ml/async/async-109.60.00.ebuild
new file mode 100644
index 000000000000..37d45d228210
--- /dev/null
+++ b/dev-ml/async/async-109.60.00.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async/async-109.60.00.ebuild,v 1.1 2014/01/19 16:30:11 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/async_kernel-${PV}:=
+	>=dev-ml/async_unix-${PV}:=
+	>=dev-ml/async_extra-${PV}:=
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.0.2 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/async_extra/Manifest b/dev-ml/async_extra/Manifest
index 1a898cb49bda..55fa9c50487c 100644
--- a/dev-ml/async_extra/Manifest
+++ b/dev-ml/async_extra/Manifest
@@ -1,2 +1,3 @@
 DIST async_extra-109.35.00.tar.gz 113512 SHA256 ef02b6b80f3db335f10cba58502f7b42b378ca0c8c1d43749240e9afce6523cc SHA512 a158dbf4a232d1bf19116568b1269249abe878d22509a3b3ef034b115143382964ec8d28e2fcaf8cbd9f270dcba006e3bc59613018cd0c5da6f2f5eb534277f2 WHIRLPOOL d4bd52cc1c5d4300b849873db72052e06cf85a477e324a1dcc01abc7c9e1d90a16981b9eb3c216821cac1b5315083eac4fa7b5c8d7e8c61c246c260085d1f229
 DIST async_extra-109.38.00.tar.gz 113802 SHA256 b66f321b97941532fc5c52a05f6a7f2d5d3b5fafd2baed73eb39dc5a6c37c49b SHA512 5c37b6313193056b5cf3381dbce19d288e2507f324316192bd7627cd91d7e5d92384ced55f9895039af53503a69fb2f464016aae207950d7ade35ca3d3360474 WHIRLPOOL 7c195e8fa716aa18b0cde74a4c390f3ad94851f3c813eb03b59e9c1c7c5e7ece96b68e3958e2e680f1e304521ce685ee30582bb629b5f16f7d4e7a95cbffe0e3
+DIST async_extra-109.60.00.tar.gz 126365 SHA256 136e315adff0d98f5d6748f778bb511e1532c5b8b772da0d685b69212e330f2c SHA512 15f939b8d8d9db7c070956a30a95f115231932fea11a87e389eb51862208f712b63a8651ddfdaf7ee1f2057528769688699e465778f73b1087976db655beedaa WHIRLPOOL 93a46a25314877b85701dbc48a7ee9fafef63aa7b63a7e8b3a671e875eaec27c65a05e4e5d40410d95c12fc7ccef005e282517af4de0ad4b58a44f83d3317a2d
diff --git a/dev-ml/async_extra/async_extra-109.60.00.ebuild b/dev-ml/async_extra/async_extra-109.60.00.ebuild
new file mode 100644
index 000000000000..26ce83e2414d
--- /dev/null
+++ b/dev-ml/async_extra/async_extra-109.60.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_extra/async_extra-109.60.00.ebuild,v 1.1 2014/01/19 16:24:42 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (extra)"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/pa_ounit-109.18.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/core-${PV}:=
+	>=dev-ml/async_kernel-${PV}:=
+	>=dev-ml/async_unix-${PV}:=
+	dev-ml/custom_printf:=
+	dev-ml/herelib:=
+	dev-ml/pa_test:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
new file mode 100644
index 000000000000..08356b261f94
--- /dev/null
+++ b/dev-ml/async_kernel/Manifest
@@ -0,0 +1 @@
+DIST async_kernel-109.60.00.tar.gz 121634 SHA256 51dc025f5b909e1dcf46d9f76072dcc6f75567b0ca3aceaac595b4ffce513903 SHA512 0d42828b08a15f2c8efe2a81b79469e0dc0a7896574ba3d27c2c27bb7de1556cd910e78a7b0b0ba6981ab7d6e8b6b1954986d52e6fc0002403779987c3ad6839 WHIRLPOOL 47dec868606361d87430faabb3fc216cf9831fb3e2efdabe77160800f7251b3221268f82cce2f7e8861d32028ff6a774600e5553d4df80b4c0be993cd253f687
diff --git a/dev-ml/async_kernel/async_kernel-109.60.00.ebuild b/dev-ml/async_kernel/async_kernel-109.60.00.ebuild
new file mode 100644
index 000000000000..d4e82651e9e6
--- /dev/null
+++ b/dev-ml/async_kernel/async_kernel-109.60.00.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_kernel/async_kernel-109.60.00.ebuild,v 1.1 2014/01/19 16:15:33 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (core)"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/core-109.35.00:=
+	>=dev-ml/herelib-109.35.00:=
+	dev-ml/pa_test:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/kde-base/kdegraphics-strigi-analyzer/metadata.xml b/dev-ml/async_kernel/metadata.xml
similarity index 89%
rename from kde-base/kdegraphics-strigi-analyzer/metadata.xml
rename to dev-ml/async_kernel/metadata.xml
index 8d1e86a9cefb..2193d772e351 100644
--- a/kde-base/kdegraphics-strigi-analyzer/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ml</herd>
 </pkgmetadata>
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index 78da997e7b98..508956f94608 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,2 +1,3 @@
 DIST async_unix-109.35.00.tar.gz 131585 SHA256 7cbfbfc074340d22f8bb0d0d81cda459d992177ae8bb857c7c70dc5d5c7b8a9f SHA512 c77f37681357ae1d9eb9dd1cb17abcfca7476a5dd5eaadb535b88a844f3fa41b32692c8eb635482f4a5df4bb02ef89778b112b4ee2dc0eb2a53c87c1b8e5924e WHIRLPOOL 02ecf0f73f1662212e3d397df72ac2fc95578ef89a69a308409b03acc3c71facc82cdaa22a44446beddefddef200a91c3f5c612de8792739bb96ca71505fd481
 DIST async_unix-109.38.00.tar.gz 133722 SHA256 3f8d83eb81cb7b88da4a9ddb798360c9aa921950392a36594510aeb0820d8780 SHA512 87cf65bd6e79bbc3f6b27d6878ef6fc506b0344c734915d1c74876341ff9a4bd5936fc13d3c4dab53965e1aec512f923266ae216b6a99cdba20751ae052c9c2e WHIRLPOOL e259465a16e09b4cbab8bd98b6ba9178f2d0e933593fead1adbce4ce117375af0601b34ab6ef778faada673179ee08dd01543d1fc0cbe1e8756783389a2ad97b
+DIST async_unix-109.60.00.tar.gz 141397 SHA256 aa90233e841dfdc8227a602d431e07770516155c92ba00298806145042a3e10f SHA512 f4fc71ef1af536b0b59db86f8149a16c37bfcf40c252e9ea5043f1a6077611bed42d03d8e8ac62c3006ec0064d84afab1e8c173b1a9c4d6c82094278422f5ffa WHIRLPOOL 36f099c556c4f9a724a4550410bdd8eaf0704962d3aacd35d90d89b9815cc150cde42b26f482536c7efc4562df43bc4022cc4cf2bd6e519b559bd2a15ed2ccc3
diff --git a/dev-ml/async_unix/async_unix-109.60.00.ebuild b/dev-ml/async_unix/async_unix-109.60.00.ebuild
new file mode 100644
index 000000000000..d640eba1168f
--- /dev/null
+++ b/dev-ml/async_unix/async_unix-109.60.00.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/async_unix/async_unix-109.60.00.ebuild,v 1.1 2014/01/19 16:21:48 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Jane Street Capital's asynchronous execution library (unix)"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/herelib-109.15.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/core-${PV}:=
+	>=dev-ml/async_kernel-${PV}:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	dev-ml/pa_test:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest
index d5f7af918fa9..2b1d72e5ef47 100644
--- a/dev-ml/bin-prot/Manifest
+++ b/dev-ml/bin-prot/Manifest
@@ -1 +1,2 @@
 DIST bin_prot-109.30.00.tar.gz 104116 SHA256 91f5b493af22a794fdebefcbdad5096d354883a191b5f9b6d3565c8dfd022733 SHA512 b3244a0671dd21e0274668595af4f2d765a4e15961acdfc68d0bffd51b916bcf1fe67f89f2471476a61c316d3fff79650c6d12ef187e94ce1b1d4f2fe5c543d3 WHIRLPOOL fb98ee525c59356aeebfbe1b632bc1c4e17fab9b7a5df37962bc81c427072dadb580e9b8dd743357b92148311c96db46ff8ffda247d074ab44f12cb7387eff0e
+DIST bin_prot-109.53.02.tar.gz 89299 SHA256 0d1e36ca48f8396366c441497a599b55cacfc24f887e7e99e54f8d51a5805689 SHA512 3c9491d7143ed38e51ebfe07209125c37eec9dc33a28943592f6c8390753f087aafef8a63d1d53104e313c297d4cabffcd1122454b2e476d5d735766816bf475 WHIRLPOOL a4f07d0c92d0dbcc0387e52d5d8723472ace7604e2d9036800e2dc7eeb0b1b21b9479d551381ceef129db59af740ab92ca5e724cdddcf41ead64142ee475cd5b
diff --git a/dev-ml/bin-prot/bin-prot-109.53.02.ebuild b/dev-ml/bin-prot/bin-prot-109.53.02.ebuild
new file mode 100644
index 000000000000..2d0f0ebb3ab6
--- /dev/null
+++ b/dev-ml/bin-prot/bin-prot-109.53.02.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/bin-prot/bin-prot-109.53.02.ebuild,v 1.1 2014/01/19 14:14:23 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="A binary protocol generator"
+HOMEPAGE="http://ocaml.janestreet.com/?q=node/13"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-ml/type-conv-109.28.00:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.2 )"
+
+DOCS=( "README.md" "CHANGES.txt" )
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/comparelib/Manifest b/dev-ml/comparelib/Manifest
index b49986742b0a..a81772191436 100644
--- a/dev-ml/comparelib/Manifest
+++ b/dev-ml/comparelib/Manifest
@@ -1 +1,2 @@
 DIST comparelib-109.27.00.tar.gz 53593 SHA256 6d7015be475a08e3e4105f10697c0e3139c6a9b62c9c9dbf5039947c522a437f SHA512 b2f612febf94f596d8ba65fcb1b582f4505fac4bc0a3e0481f446bcbb72036410bd05628367a32b7ba4655cb052cff17cf1b8499f7e562566858216c7786a873 WHIRLPOOL 85281665252471d7c5e89a62ccec1c15c8aaa41778bcdeb81c6b4b2887cf749f9fef10b058c866a7b5b7bf6c9e8390cccdd43e52947a73d1c3a89bdf5b0c225a
+DIST comparelib-109.60.00.tar.gz 56707 SHA256 1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e SHA512 0a20267b06ddb840f31b3aec7b4cc0a77aa5a5e7f454c1d163944e4b233233b5cc1d266aae52eaffbc0721e8d83f2ec345444032af1dc2e0b75bb78ae06e33cb WHIRLPOOL 092abc147a3531d543a9fb68526c4a9839b4ca4f12674962b15a6da01caa69d5ae4e111b29ad9b06b1a2f703a017b04b71016b421ad2334447ed0f47d47d0332
diff --git a/dev-ml/comparelib/comparelib-109.60.00.ebuild b/dev-ml/comparelib/comparelib-109.60.00.ebuild
new file mode 100644
index 000000000000..126eb0226134
--- /dev/null
+++ b/dev-ml/comparelib/comparelib-109.60.00.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/comparelib/comparelib-109.60.00.ebuild,v 1.1 2014/01/19 13:44:59 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Camlp4 syntax extension that derives comparison functions from type representations"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-109.20.00:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index c94ddae474ff..a09a6400cfab 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,2 +1,3 @@
 DIST core-109.35.00.tar.gz 632262 SHA256 20ff89722c5a5a5a15eb30470a1676a5bd1a72d60f6a5bbf76675223c148fa93 SHA512 08ca8e7ceac6fd9a0b09562ea2a0dd472dc32a55cba27b45957fb078a12604eae9a092e250d79f9f4c6105b9b3184ad21c1214fed56d8d1b33f3e6545a7b1040 WHIRLPOOL 14fe5e7ad641977d07dcb50866bfb1ebf13b72546b4ff5ac49b2f25ccd859de60f48d034914f64196a911f5782afce1103571ae49122814a330895b8adc8ded1
 DIST core-109.38.00.tar.gz 632794 SHA256 0bd685b19ee0ca165a06b6c4f61784122f4c03c04b0dbc51d4d680679e7f7bb0 SHA512 36fd2f152432c8b228d2c07cf40277ea7ccb1a0f0c467be967f0943ecdb8688bdb14c8a245dcd9dd37a8e018d54ba366d631ec60164a7c112a289b2dc59ab16f WHIRLPOOL 8330f0da6f4ef32241ffa3f08f54890a9c12974cd434838606699e31ce4dc3966ac6626491420b99c61183a2f01061da501e221764cd8c654207da9395ff473e
+DIST core-109.60.00.tar.gz 705382 SHA256 30a1cd2de3ca05037471fbb167c7393df210bc7b988dbe2f9c4fb43c05bdf31d SHA512 2ec7c67b43b68e345948d7cd142da64d24857692fe4f3870e4cc065cdf6d9f12e21876fe8895d10c9f6a5eb3a8bf5cb1766683a0a799f42e3080b7ab73b163e9 WHIRLPOOL 49d1e44ade7a3cb3742014cf15f687a2a2504cf9c7e2c8d774b928aca018295fe62af1c4a6de2aa87347634dfd3234274c0cd23be23b54d5ffa1bf6dfaf4b0b2
diff --git a/dev-ml/core/core-109.60.00.ebuild b/dev-ml/core/core-109.60.00.ebuild
new file mode 100644
index 000000000000..e777d228f3fa
--- /dev/null
+++ b/dev-ml/core/core-109.60.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-109.60.00.ebuild,v 1.1 2014/01/19 15:59:08 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit eutils oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-ml/core_kernel-109.35.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/variantslib-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/herelib-109.35.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	dev-ml/pa_bench:=
+	dev-ml/pa_test:=
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.2 )"
+DOCS=( "README.md" )
+
+#src_prepare() {
+#	has_version '>=dev-lang/ocaml-4.01.0_beta' && epatch "${FILESDIR}/${PN}-ocaml-4.01.patch"
+#}
diff --git a/dev-ml/core_extended/Manifest b/dev-ml/core_extended/Manifest
index deec98080433..5d73198b977e 100644
--- a/dev-ml/core_extended/Manifest
+++ b/dev-ml/core_extended/Manifest
@@ -1,2 +1,3 @@
 DIST core_extended-109.35.00.tar.gz 275016 SHA256 d6f825cdbca34d225b6884c7163041f54d8f46cd68b86ea76b7bb7fe13a5ba33 SHA512 79899413fef83afd1ae92e18bafb43f5953abbad43a3aefa78aa0862ef7124177f5c3b0744b78181f6575530028138c28023ed9d4da234e0bc50063c642f8fa1 WHIRLPOOL b8a09f24b4cbd499fc5a64548afd28b5567c1af02e6f346eeef112e41f10a32ecf1ff1bcfc8df78ebe186174758fb83630adbadc6e6a61fde58d287590f7e8ea
 DIST core_extended-109.36.00.tar.gz 280952 SHA256 f8093add72e6c77a3b51687bc2aa606470013496f55df87e40622576c337b1b5 SHA512 cd697dfdf3cc1a57c3ed94f842cdc409f253b16243b0bc5a9cb533ab56ed7fe0efd8ba900550ec4b71b0d654be957e87474ce46de5cd496ec2256a1c04786f4b WHIRLPOOL 842da7bd51de88f155856ebed09785609987bd888b2358baf069f6a4894631ff533b9eaf30491db13c8e9b3b1457114550a4f1bf3055dbd7763e16aacf8d230c
+DIST core_extended-109.58.00.tar.gz 285701 SHA256 2eb849ca15add17722085366900b1499fa82d1b4d11d721cdcf5efa8a8a1c998 SHA512 1dbc87ce53117890674c12c72812ea017b5541e6da671d0afc357418e50798b9695b99fe1337aff5850feaef995f80468ef9e2b2b191aa5ee6812d602de097f8 WHIRLPOOL 6a48a00484121c635cd0f3786c56a83725a2853f35ee1e44fe5b318a4fc9e508c0ef41a808e964dab12d0ede2d10a3a39ad8047ed021b351c590df1e33c946c5
diff --git a/dev-ml/core_extended/core_extended-109.58.00.ebuild b/dev-ml/core_extended/core_extended-109.58.00.ebuild
new file mode 100644
index 000000000000..d332a0a0bf87
--- /dev/null
+++ b/dev-ml/core_extended/core_extended-109.58.00.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_extended/core_extended-109.58.00.ebuild,v 1.1 2014/01/19 16:39:24 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-ml/core-${PV}:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/custom_printf-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/textutils-109.35.00:=
+	dev-ml/pa_test:=
+	dev-ml/re2:=
+	"
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.0 )"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 42d44364184f..9e5d0e248d80 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,2 +1,3 @@
 DIST core_kernel-109.35.01.tar.gz 344019 SHA256 e408f3e26b5dca582bd52594b0d2a248d785a1b2c9683056588fa7fb61e64902 SHA512 2bdad838695740e469b74a6c83af38db4dfb0f26cb935389964bfc4cb3ae1b7bb33927e7e0e594ad358e066fe3b7280d21366d12e3c0f821183f8b235f577828 WHIRLPOOL 67151150a3a088e0b7cc4c9303fc7ac1db4e1f83ba089464364e7a2be629257ff549caf550b374557e90464b4ed8e2e34d36d5593eeef78138ad650eff3f078f
 DIST core_kernel-109.38.00.tar.gz 345403 SHA256 acf9499e767bcaea95adca0e9cbb2547e22bf6868d6096ad7cdd1e512467e6bc SHA512 0fa193b15f4cf1131333b2f28e04d7e49f4d727b212e51d8f368793ff1353b44ade2d1446764fe8db975e7152e5e141b0b6efc5e5e0951f936415d73eb313b57 WHIRLPOOL f893dc356e0436c6e1c33ccb25502be5a5381cd1e5041c64b65456e134df98f7f239b679eea2a886e900cf7b0b29193ea16fdf58096f17a20d02ec78a2553adc
+DIST core_kernel-109.60.00.tar.gz 374830 SHA256 5cb5b32255d3b7b224a2d320ebcdb5b341c8588445e6bdfea3ffb54286503a1b SHA512 a7ae28b8f910d2e380e54b38908723f070e144914f3086ef462080341e50eb3a1b8e83f3311a92cdd10be50efa0390c09d1f97fb5fba2a75d76b603ed2df8b4a WHIRLPOOL b5d146db8961bd34636de30f8cda1733076f78235393987776ce4b896fa4bf298cae1b5199679c4879d16fa121c37ee401d82f84510ade5e0fb2625e9e38e89c
diff --git a/dev-ml/core_kernel/core_kernel-109.60.00.ebuild b/dev-ml/core_kernel/core_kernel-109.60.00.ebuild
new file mode 100644
index 000000000000..6a1d1bf77eb0
--- /dev/null
+++ b/dev-ml/core_kernel/core_kernel-109.60.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_kernel/core_kernel-109.60.00.ebuild,v 1.2 2014/01/19 19:40:00 zlogene Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-ml/bin-prot-109.53.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/herelib-109.35.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/pipebang-109.15.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/variantslib-109.15.00:=
+	dev-ml/pa_bench:=
+	dev-ml/typerep:=
+	!dev-ml/zero
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/pa_ounit
+		>=dev-ml/core-109.60.00
+	)"
+DOCS=( "README.md" )
diff --git a/dev-ml/custom_printf/Manifest b/dev-ml/custom_printf/Manifest
index 491d5747d08a..541d5a9b8dc8 100644
--- a/dev-ml/custom_printf/Manifest
+++ b/dev-ml/custom_printf/Manifest
@@ -1 +1,2 @@
 DIST custom_printf-109.27.00.tar.gz 47893 SHA256 3589effb015fceaab943bf7074493232d33f0eed3b4ad5500f10b6014f2dcda5 SHA512 7a4cd650ee94b5c1ed1e68da54dcb5ddee56d7a8fb05a9fc660ed0bd616d88427e47fe4d7a98d95c9e58707376834b687f1ed0feecd1655228885bb1a3ccf7cd WHIRLPOOL 4819d845385a58f0210e896cc63fd1c3549cbfc15cf803120e996b1dff2739fffb5e9805d9183f1cc3ee306cdb098f014568bf8b1e781de20e41bb45cbb000cd
+DIST custom_printf-109.60.00.tar.gz 50974 SHA256 223d145eeb15ae78f053b80e967f318035a0754d0edcff98ec9b87f4bece6bca SHA512 620608020787c21b212183bef72b60ec795841597a18a248c37b6d8e239b5c53ca39a1209a040acdb6b77b2593bf3d07aa0c04bcf06ac733a6aa2ffd5da0afee WHIRLPOOL fc7348c34fed4f83d0809750c385a9b3a45b778699dacb1745863e6783343fecb6f07e9e6c64dd494bfb908af41e5fa44b85f2d4571860b917f8555e8a61de55
diff --git a/dev-ml/custom_printf/custom_printf-109.60.00.ebuild b/dev-ml/custom_printf/custom_printf-109.60.00.ebuild
new file mode 100644
index 000000000000..f4bc09fa16bf
--- /dev/null
+++ b/dev-ml/custom_printf/custom_printf-109.60.00.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/custom_printf/custom_printf-109.60.00.ebuild,v 1.1 2014/01/19 13:42:29 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension for printf format strings"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-109.20.00:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/faillib/Manifest b/dev-ml/faillib/Manifest
new file mode 100644
index 000000000000..3ab1758f638c
--- /dev/null
+++ b/dev-ml/faillib/Manifest
@@ -0,0 +1 @@
+DIST faillib-109.60.00.tar.gz 47376 SHA256 f90e56a2fd47aa6e644c9e87da101a2f644e65c012889c6d566211b4e7d43370 SHA512 950ef8550d97576870ced3afbf28efcaa043f234dc160c40c7d6ddd80d31518cf2fce9cb8f741d71fb39c852415b9975f4b7e7eec8bbdaf5eaba79581d02abc9 WHIRLPOOL 92a5449cb6eb1282d7f6e32ff1168ffde230c4262b46f40b97f2b32b29e71154ca9e5c31a8f1faece2ef93b6df60c5341476466aea7c12f4c9f32c83e17709e6
diff --git a/dev-ml/faillib/faillib-109.60.00.ebuild b/dev-ml/faillib/faillib-109.60.00.ebuild
new file mode 100644
index 000000000000..d84bd2e174eb
--- /dev/null
+++ b/dev-ml/faillib/faillib-109.60.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/faillib/faillib-109.60.00.ebuild,v 1.1 2014/01/19 16:29:46 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension for inserting the current location"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-ml/herelib:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/kde-base/kuiviewer/metadata.xml b/dev-ml/faillib/metadata.xml
similarity index 89%
rename from kde-base/kuiviewer/metadata.xml
rename to dev-ml/faillib/metadata.xml
index 8d1e86a9cefb..2193d772e351 100644
--- a/kde-base/kuiviewer/metadata.xml
+++ b/dev-ml/faillib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ml</herd>
 </pkgmetadata>
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index 99cadc49cbd1..ea5f5cc19791 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1 +1,2 @@
 DIST fieldslib-109.20.00.tar.gz 53028 SHA256 56dbf06604efd2664ff14e7f242fdfbb3835b9b19ed904dc9952838f0c53434f SHA512 27732eef789ad0217327b1aba0c52a431d3cf9f84ebe4be7d1d1d552b56af76b8921d53492aa5d9989e78eed49c16e29001beaeb35426efc3a50b54d5a605569 WHIRLPOOL 1c421be18cc30ff2457678b858ff49aa03c463ae1cf4c0a883fbb112b33fa8915636332ae7705a31f8c91b70726368c212c368735b92c949834a04b098c26d4e
+DIST fieldslib-109.20.02.tar.gz 56179 SHA256 5a0dc4ace3b0270b776ff777e07e42696f3ca1f861419ff4600b3391d0240e6f SHA512 6971e9828199a8befa276c269869b83e203475db3b0d7fc5687cdd2bfa321fa5ed80e15cf451065063c73e7f385a20ae8cafdacadaeee7f8c18044e6384bc3ca WHIRLPOOL 01329b4911b6971097da5ff015218d70306c08945b3e238634948aaa1dea062e1ff3bb16f64a95620a61f9891e063cc8afdb290b17a5ea9613ed5ed532b2a968
diff --git a/dev-ml/fieldslib/fieldslib-109.20.02.ebuild b/dev-ml/fieldslib/fieldslib-109.20.02.ebuild
new file mode 100644
index 000000000000..e385b3d9aba5
--- /dev/null
+++ b/dev-ml/fieldslib/fieldslib-109.20.02.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/fieldslib/fieldslib-109.20.02.ebuild,v 1.1 2014/01/19 13:38:11 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Folding over record fields"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/herelib/Manifest b/dev-ml/herelib/Manifest
index 575f20074c75..a0c186afd70a 100644
--- a/dev-ml/herelib/Manifest
+++ b/dev-ml/herelib/Manifest
@@ -1 +1,2 @@
 DIST herelib-109.35.00.tar.gz 44436 SHA256 183853f7e6f88be0884672d5acdc1f8d6aa3c3204d85b6f9b0b984700e0fe079 SHA512 473de2701a2f83d831bb8a0af4aa4bae86f5b6dd30503eaef6715bce5f22b13cefc2f5e333650ea04780d07edad925fbfe13325909da50a28397a9fe4d115fa4 WHIRLPOOL eca71daae788e5ee2cd66a6e25cb3f6d1b956a208459c36026c13ce65788fbdc912cda4457df0d98dfa516c17fbab7fe2fe11fe358df280a935c8abfb4daaafa
+DIST herelib-109.35.02.tar.gz 47650 SHA256 7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a SHA512 2ab68fb4ed5acce2dd0cbbac658743713d6534ae7f215dd8e34f97b0ef94883ffaf68462651473f8f6a0ef95dbf26c21857bf261291c3accab01d094008c4838 WHIRLPOOL ebed805ba8eff3c410368f929845c24b288bea91cce5b89bec6f031b72cac91091666773d44468009716c937a26c175f81be7726239deb0e0e4d662feccf338a
diff --git a/dev-ml/herelib/herelib-109.35.02.ebuild b/dev-ml/herelib/herelib-109.35.02.ebuild
new file mode 100644
index 000000000000..6066b1324749
--- /dev/null
+++ b/dev-ml/herelib/herelib-109.35.02.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/herelib/herelib-109.35.02.ebuild,v 1.1 2014/01/19 15:46:34 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension for inserting the current location"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.00.0:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 444af6454b39..9acc2e46b76a 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1 +1,2 @@
 DIST oasis-0.3.0.tar.gz 298052 SHA256 2efa90a2dc31d0b731dc574f99ca3e1fd07079da1898b077d84db4a3fd212701 SHA512 b8b9bb694c0d29364b39ff4fa10647e2aad0371d5345cae47ac99f1853e331153e6db7d9088f898b7e21793b97af1b4aeecb0e78d962a54d5b6d2c99f4c3cfe7 WHIRLPOOL d3f91be86c858e634120f297359f45d81abe593c207fb182eb3b7af2ed3b676cdadfcf1bbb417f87bfd610934fdf8fd4b12ae0bceb4232e500553ecf31bd3b4d
+DIST oasis-0.4.1.tar.gz 309466 SHA256 12ca49699dceba687cd150a5b5e66246450d2e06e47578a701c140195ce256d3 SHA512 34424f174794cc00de485660134e6358fda222a2d5bb29959be31dd8bdeacac9c37d2c3bdffd9c4ee3d53b05695e1e7580858198fcd088104e60f2c813401e23 WHIRLPOOL a60ddad0f058fab284c35c6887a597d48d8ab23574d700da6d8f6463eb73d9ec451dd60540616b4088d667d8b79fa185b575d2071e85980ae32e634b6453f234
diff --git a/dev-ml/oasis/oasis-0.4.1.ebuild b/dev-ml/oasis/oasis-0.4.1.ebuild
new file mode 100644
index 000000000000..0c9c55c8820c
--- /dev/null
+++ b/dev-ml/oasis/oasis-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/oasis-0.4.1.ebuild,v 1.1 2014/01/19 12:40:51 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="OASIS is a tool to integrate a configure, build and install system in OCaml project"
+HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1355/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:="
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.3.1
+	dev-ml/ocamlify
+	dev-ml/ocamlmod
+	!<sci-chemistry/oasis-4.0-r3
+	test? (
+		>=dev-ml/ocaml-fileutils-0.4.2
+		>=dev-ml/ounit-2.0.0
+		>=dev-ml/ocaml-expect-0.0.4
+		dev-ml/extlib
+	)"
+
+STRIP_MASK="*/bin/*"
+S="${WORKDIR}/${MY_P}"
+DOCS=( "README.txt" "TODO.txt" "AUTHORS.txt" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 7e184d7cd720..6ae0ce0ac423 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1 +1,2 @@
 DIST sqlite3-ocaml-2.0.4.tar.gz 60665 SHA256 51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1 SHA512 7167397cf4731599cbd4a916941e2bf394755183e4f925a0cacd80352b030e9517fc492f6d24fb7e9f44dc705570303d8a96247c69309543090896c7ffacc0cc WHIRLPOOL ac844deb1d1e410eab9cae1507f22ee5d01f92df31054894f0c2351053365b978d86288e3dde62129f9f972c326cefcbc15c7a0c570629fc7220fd74602f9b7c
+DIST sqlite3-ocaml-2.0.5.tar.gz 63765 SHA256 251f710e3b66cb3651c2330e447a8633fe7e5bf968030946f4f913375cfb0efc SHA512 019283ecc8e65b1125fe11112d72c652351093fe3228cbc1d07e126c15d5fde73a6b2e5466740bdcf2b59e20e68f0189f4fc89797205f9a6be104e5759140297 WHIRLPOOL be42c73a06990e00e22c3d30f4324c6278062419f6e60853f8954ec817b4e194e26fa1e0955bc1424eee42815f079e72a5443c792371fc3563980afa9e8ef3da
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-2.0.5.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-2.0.5.ebuild
new file mode 100644
index 000000000000..c2a0f700e9c8
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-2.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ocaml-sqlite3-2.0.5.ebuild,v 1.1 2014/01/19 12:44:04 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases."
+HOMEPAGE="http://bitbucket.org/mmottl/sqlite3-ocaml"
+SRC_URI="http://bitbucket.org/mmottl/${MY_PN}/downloads/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+	>=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/pa_bench/Manifest b/dev-ml/pa_bench/Manifest
new file mode 100644
index 000000000000..f6952da2b5d4
--- /dev/null
+++ b/dev-ml/pa_bench/Manifest
@@ -0,0 +1 @@
+DIST pa_bench-109.55.02.tar.gz 51237 SHA256 98f0158e0997ab400d182537a6f6bff4ebccf0e14424fa470391b17c2e1e5dc8 SHA512 fa129c3d3b1c3a6e6f09f43751eba8cb4bb775b6a1b2031249507c05538364710844d0d6efc58b283552980629d0f2a2189b75aa24d58daa8d8ce12883f2ee89 WHIRLPOOL f0b81d9c6ac377684adc0a86b91042a1ce1ba2d15cd9f86093cd58d44f90d8917807c9ebc460b577251d8194a97ae06561e51de22ccb586ba53518809fbd26e3
diff --git a/kde-base/kdesdk-scripts/metadata.xml b/dev-ml/pa_bench/metadata.xml
similarity index 89%
rename from kde-base/kdesdk-scripts/metadata.xml
rename to dev-ml/pa_bench/metadata.xml
index 8d1e86a9cefb..2193d772e351 100644
--- a/kde-base/kdesdk-scripts/metadata.xml
+++ b/dev-ml/pa_bench/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ml</herd>
 </pkgmetadata>
diff --git a/dev-ml/pa_bench/pa_bench-109.55.02.ebuild b/dev-ml/pa_bench/pa_bench-109.55.02.ebuild
new file mode 100644
index 000000000000..38eae2fd1a35
--- /dev/null
+++ b/dev-ml/pa_bench/pa_bench-109.55.02.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pa_bench/pa_bench-109.55.02.ebuild,v 1.1 2014/01/19 13:53:06 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Syntax extension writing inline benchmarks"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:=
+	dev-ml/pa_ounit:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pa_ounit/Manifest b/dev-ml/pa_ounit/Manifest
index 06f27ac4a1a6..bd988287d539 100644
--- a/dev-ml/pa_ounit/Manifest
+++ b/dev-ml/pa_ounit/Manifest
@@ -1,2 +1,3 @@
 DIST pa_ounit-109.34.00.tar.gz 51282 SHA256 700078948bd8e9388bb4e1ab5b357e250f484da984ea9b901fc4b76ae0e8f581 SHA512 5d3af627c49e00b1a2275dc5083ad9d393fd9bdd553807f3b6ecd5ecd085e26c6d993d4d1c470d3421a0a9674396afe2585861c30bc0e862730ec341fb269208 WHIRLPOOL 736e521583916e6ca5937f4486647dc95e8441121c446d673eaa5471987f87a1e79177f9279ad1c27a91acd9ffa10030fd5136c5c07069f9c3ebc82028545201
 DIST pa_ounit-109.36.00.tar.gz 51228 SHA256 20779d41f1e18b4981ddc2391565480dcb6b2cb6dc87c80fe02b17661c463e95 SHA512 107c79388d948a38a79405d7cb67d556120ff6a3f4667ddd01cb16da24b67db04b431f3345166627af3cabe11156ea52b6a5842e813a193fc99f5b0e6bbcfb3d WHIRLPOOL ac2e828163ba8f6f9effcf8f9d2d1bce33dd34f11def525003de766a1293f031c7b240964ccb0cab578b34edfebe60240a8918189fda471aea2ae35636bb34b2
+DIST pa_ounit-109.53.02.tar.gz 54573 SHA256 cc990c97b034fb9045dc7db5bb5187b16dbe9d323649d7beab153f988bd67421 SHA512 99e0e2d8250148266ea290ae0cfbc0f3c7918f811b4bafa1321b0cebc58628b081ca01c7d52e463b4ab03e9b7cfe744fed777354f09aa0fcc2b1482582fbcc5a WHIRLPOOL 2b4e86bcf4baa3655524788d4e4aba6880e9316adf349e7f60956107352fc2374273feb9339a8270f52b52ff67d97ce774f108fa9227f0eafd6b84bffc6f8303
diff --git a/dev-ml/pa_ounit/pa_ounit-109.53.02.ebuild b/dev-ml/pa_ounit/pa_ounit-109.53.02.ebuild
new file mode 100644
index 000000000000..8dd8dc122305
--- /dev/null
+++ b/dev-ml/pa_ounit/pa_ounit-109.53.02.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pa_ounit/pa_ounit-109.53.02.ebuild,v 1.1 2014/01/19 15:42:49 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension that helps writing in-line test in ocaml"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/ounit-1.1.1:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "readme.md" )
diff --git a/dev-ml/pa_test/Manifest b/dev-ml/pa_test/Manifest
new file mode 100644
index 000000000000..d5e2f56915f3
--- /dev/null
+++ b/dev-ml/pa_test/Manifest
@@ -0,0 +1 @@
+DIST pa_test-109.53.02.tar.gz 48755 SHA256 8626f66a62b201e08458517d7d75c41acf677eef00714fb465167729b54871e3 SHA512 b9556c08ed5c448fe40dc3740ca52674b6ff5d79e722ed7c14fdbb893aed56e352b21832c3adb481c1095035b47212f2a87242735a910ef4721bdd2ec6c4b461 WHIRLPOOL 6121187dd3f0cdd67e2f4a2729079e7c3c6f521e73cb4474307b172fa8a67a03f66f820c82ec7f62b71328d1691d115b1b44ab07afa09e6f793040144cf88a7a
diff --git a/kde-base/kstartperf/metadata.xml b/dev-ml/pa_test/metadata.xml
similarity index 89%
rename from kde-base/kstartperf/metadata.xml
rename to dev-ml/pa_test/metadata.xml
index 8d1e86a9cefb..2193d772e351 100644
--- a/kde-base/kstartperf/metadata.xml
+++ b/dev-ml/pa_test/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+<herd>ml</herd>
 </pkgmetadata>
diff --git a/dev-ml/pa_test/pa_test-109.53.02.ebuild b/dev-ml/pa_test/pa_test-109.53.02.ebuild
new file mode 100644
index 000000000000..3b645f895a2c
--- /dev/null
+++ b/dev-ml/pa_test/pa_test-109.53.02.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pa_test/pa_test-109.53.02.ebuild,v 1.1 2014/01/19 15:34:42 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Quotation expanders for assertions"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:=
+	dev-ml/sexplib:=
+	>=dev-ml/core_kernel-109.60.00:=
+	dev-ml/comparelib:=
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index bb2f4e529fa6..43e08811fb99 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,2 +1,3 @@
 DIST pcre-ocaml-6.2.5.tar.gz 60724 SHA256 f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47 SHA512 9665643165beea8515f22d90a6a0f079108826ec46ce89248c795e982f9b4ddecc0e882a32a9893acac1001d810aad7f3bc7d7b6162ab1260fa4f698c91e04b9 WHIRLPOOL c99da092f8e78de19ea624a021a088b3e19b1accd2b33bc084179f7c1b88e8ac2b51c143321a792067e325568d6ea4c059fc57ac9da477e998cda3936140567c
 DIST pcre-ocaml-7.0.2.tar.gz 81910 SHA256 052a2fdd8da597724ac8ca474fdd40772b461888e3ff8ef75cc71e43a65766ea SHA512 13ed6534005d819c62a2d70c4800bc4a8f019026d2d56175d0b10a130636a092f9053665382cca2c819c75dcc25fe26ff85fa0c51878b0c1c58d5f77cb45cbe9 WHIRLPOOL bf635d30a6a93b00144f092dcc0cb19d7f5bfd1b5700319f9ea7fbd59d0a62656227fae96781282563702c4872b4e6a7577435ad6469c8639c98d284bb8641f2
+DIST pcre-ocaml-7.0.4.tar.gz 84956 SHA256 fc56b0e0f7ab5d159af77d1a51f67d0dd0b86ef30eccc0e9cbef4f79d4a75840 SHA512 2b00a784bcda8c476014875c87cb12b2dc111f0c003c4fa3aedc4963ed1a75fc7cde22b20bdf071e2637bdfe7bf0fe094e5073a141644acaefdecddca6b6af72 WHIRLPOOL c3352fe803924649867b8f63da137ab81a15b4c12f3855610097513bf093df43d6d9a1c7d0992ff0a1a4ccca873b538b28285811218d6a833faf6a994026bb69
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.0.4.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.0.4.ebuild
new file mode 100644
index 000000000000..a9983d3e3f1a
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-7.0.4.ebuild,v 1.1 2014/01/19 13:18:26 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://bitbucket.org/mmottl/pcre-ocaml"
+SRC_URI="http://bitbucket.org/mmottl/pcre-ocaml/downloads/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5
+	>=dev-lang/ocaml-4:="
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-ml/pipebang/Manifest b/dev-ml/pipebang/Manifest
index 5adfb35fdba1..99c5e00d34d9 100644
--- a/dev-ml/pipebang/Manifest
+++ b/dev-ml/pipebang/Manifest
@@ -1 +1,2 @@
 DIST pipebang-109.28.00.tar.gz 43937 SHA256 590475b17b44b268f5d5318a3348f1fd8d1aed48f4d1ac7633ed162b5f277137 SHA512 99a0d2aae20265e9512199775e756863e66e1c5481cab75ba66969974a0ddd18207204098616473f0c8cc088ef2f05e66aea3e2fd75b413fcd4e56ded04228fe WHIRLPOOL 24aba6d3e50990e0640e9adc7d8dc0adddd461454a0227408d818c5fd46dd268a131aa264de5832e9d062cf0c155076ffb434a941345fa5eb85fb19e2497199c
+DIST pipebang-109.60.00.tar.gz 47044 SHA256 cb68e0e03aa01c523ebe3f458126abbe59e0698d3855ed779e33b1654179ea50 SHA512 ca37241e0fad5668ddaa93ead89bd83e6c674e3773001dada1bafdd9eecbcb86b9992c3860ae0b2a0b99e472c931f90c46319f010aeeb1babd916ef1a5438ab3 WHIRLPOOL 1a35232a4de31cb6470bf1ee8756b4ce2206bbff93b3d512beedbb2ae46754593762edac4fec39ff6416b03429cc28abe71399ad4694ee3b20a568214daab470
diff --git a/dev-ml/pipebang/pipebang-109.60.00.ebuild b/dev-ml/pipebang/pipebang-109.60.00.ebuild
new file mode 100644
index 000000000000..03ba6c0bd7d7
--- /dev/null
+++ b/dev-ml/pipebang/pipebang-109.60.00.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pipebang/pipebang-109.60.00.ebuild,v 1.1 2014/01/19 13:40:19 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Syntax extension to transform x |! f into f x"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/pomap/Manifest b/dev-ml/pomap/Manifest
index b2a8d6af7938..29739f289a73 100644
--- a/dev-ml/pomap/Manifest
+++ b/dev-ml/pomap/Manifest
@@ -1,2 +1,2 @@
-DIST pomap-3.0.1.tar.gz 69989 SHA256 1afbedafedb6922937cb58b3bbef057e69f2908cac899288257ba608fbf534ce SHA512 901c7655686711978df476332d2ef969c6eefa47a276f88e227c43d95e21d4bc6e301b3880d69a3c5c1e2278c1bab511e9b538f8278ad79ee0ea54efe6dcae5d WHIRLPOOL 1c2893ba61058e3effa03b2d42972c2c2f3d733c5c815b90a4ea95e701ab17917969088868c7a220387127bb10bd190aea7cbfaa1c2facd0807da0c62118f858
 DIST pomap-3.0.2.tar.gz 69919 SHA256 44e9a7ca73fc8a11ffccaed65444e1cf67b1ccb2737f942bd6a99f6ceb743e0c SHA512 cbf239023c0861fd076895c45c9fb05e9794af4ecab913a5a0fbba188ed1c52a8f880ffe66dda0845863a31e30cd34f40add872abe0135c79467dda6c429423f WHIRLPOOL aec4f2aec45ae2768d43c8e14b7d515dd0a6ac841c9b11a402499f1bfc2f825e06102826ca6437fcad0830ea6356fae9bc50d62651d5c9b7873764b84e9d4c05
+DIST pomap-3.0.3.tar.gz 73040 SHA256 ff35571fb06230d4448ec61d57dc46d38019ceba1e650600c7eedf26590a5256 SHA512 f0a3d1dcbd8cbcffebaaa4fb4d59fe8bc439a689c67b34c3653e9142934265081a65fcab132f0ad5933cdc4f9b0eb776018e3b0df8762c7e5ba7dc61a0021d42 WHIRLPOOL f4d1ef0287583321a3bed8ad1612cb9babcfabe7694afb148f650a4ffdf509f0acd1327ab6ed0058609776904a22ddab3a91339eecf130dd4dabdc56b7b3410c
diff --git a/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch b/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch
deleted file mode 100644
index b0d7bfa42605..000000000000
--- a/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Dummy find implementation required by ocaml 4.01.
-
-https://bitbucket.org/mmottl/pomap/issue/1/pomap-301-does-not-build-with-ocaml-401
-
-
-Index: pomap-3.0.1/lib/ptset.ml
-===================================================================
---- pomap-3.0.1.orig/lib/ptset.ml
-+++ pomap-3.0.1/lib/ptset.ml
-@@ -336,6 +336,8 @@ let rec max_elt = function
-   | Leaf k -> k
-   | Branch (_,_,s,t) -> max (max_elt s) (max_elt t)
- 
-+let find e t = if exists (fun x -> (x = e)) t then e else raise Not_found
-+
- (*s Another nice property of Patricia trees is to be independent of the
-     order of insertion. As a consequence, two Patricia trees have the
-     same elements if and only if they are structurally equal. *)
-Index: pomap-3.0.1/lib/ptset.mli
-===================================================================
---- pomap-3.0.1.orig/lib/ptset.mli
-+++ pomap-3.0.1/lib/ptset.mli
-@@ -70,6 +70,8 @@ val partition : (elt -> bool) -> t -> t
- 
- val split : elt -> t -> t * bool * t
- 
-+val find : elt -> t -> elt
-+
- (*s Warning: [min_elt] and [max_elt] are linear w.r.t. the size of the
-     set. In other words, [min_elt t] is barely more efficient than [fold
-     min t (choose t)]. *)
diff --git a/dev-ml/pomap/pomap-3.0.1.ebuild b/dev-ml/pomap/pomap-3.0.3.ebuild
similarity index 63%
rename from dev-ml/pomap/pomap-3.0.1.ebuild
rename to dev-ml/pomap/pomap-3.0.3.ebuild
index 748278f36141..1d3028255e9a 100644
--- a/dev-ml/pomap/pomap-3.0.1.ebuild
+++ b/dev-ml/pomap/pomap-3.0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.6 2013/08/19 16:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.3.ebuild,v 1.1 2014/01/19 13:14:00 aballier Exp $
 
 EAPI=5
 
 OASIS_BUILD_DOCS=1
 
-inherit eutils oasis
+inherit oasis
 
 DESCRIPTION="Partially Ordered Map ADT for O'Caml"
 HOMEPAGE="http://bitbucket.org/mmottl/pomap"
@@ -16,19 +16,16 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
 
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.01_beta' && epatch "${FILESDIR}/${P}-ocaml-4.01.patch"
-}
-
 src_install() {
 	oasis_src_install
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
index fa81ad126739..59a6c232baf1 100644
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -1,2 +1,2 @@
-DIST postgresql-ocaml-2.0.2.tar.gz 75698 SHA256 b9007e472dd2836a9d044ca09546bd3bfc91e331204d99b55da261f5f0fac68f SHA512 5deb3210783753b71bd958e693be070453be378aa820875cb62e01cbaaaf111bec2043227e6bdfbfeaf7e2d94ad364e741b667f678f8d0124893229af29c7d3b WHIRLPOOL 658f6543e8c4f22a87d31346037761bb7ce8326028bedecbc3990613cb16614d1ac8ccdf6fc1a8cf8ad6bdd33646113e003f9d1d59fec1f506c184d9f2a6399f
 DIST postgresql-ocaml-2.0.4.tar.gz 75931 SHA256 b5806aa649e7015dd509132263bf3c7879c1c334475cba8ba7270c309f865975 SHA512 a4e4990c6495eea30138c32765da71b29d9b867a05d6566d3c9a877d84d360a415a6f0603df39ad206fbf66503f4d7e333d3c5bf766757a21d1b3207b07cc377 WHIRLPOOL afb646b7a1ff8593087aea256cbb156c6d9ba664f35520fde1ced6e1b35ab8a651c4e8b1829d6c1a5384d999252077c6432c3833d9cb3f53d3c7046ee7d05a9b
+DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801f445d59a29bd49713eae5cf5c157eaa8 SHA512 1d4b09b9135e1d6a98295bd51175ac44e6b51219703ad8ba5c0d429d81534989b43ed8922eff6511de4fc31b6dde1e6ca4f7bea91981e3d8c025d151258e41c7 WHIRLPOOL 04ae6fb1865fea75f286faf366ba4a976f260c502de1f898b48c8fb93b70ddedfdeeb9383e54efb2dd3b15e9b6d5302e1a5e0009188d8d83bbd69d4448774eef
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.5.ebuild
similarity index 83%
rename from dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild
rename to dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.5.ebuild
index 32a89c82aca9..26b6b1f7675d 100644
--- a/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild,v 1.3 2013/02/17 17:37:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.5.ebuild,v 1.1 2014/01/19 13:11:04 aballier Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
 
diff --git a/dev-ml/re2/Manifest b/dev-ml/re2/Manifest
new file mode 100644
index 000000000000..5647b6562be3
--- /dev/null
+++ b/dev-ml/re2/Manifest
@@ -0,0 +1 @@
+DIST re2-109.55.02.tar.gz 470378 SHA256 08f3370009575277b49b7d40af0fc5e4487e0b397e7cca3f7116119d7de43161 SHA512 8c7b85078da66bc6d9cfa01a63f3d876cea99ac7afb023f781cbc4f271e1a4a0169b8474023bec5e52a8975df3710d431a0aa99aea2f056e01bf8f2b20050d74 WHIRLPOOL 091c09e2660c435aafb445a4e548663c2c6691f46e99d80fb856e7ef967cf5b6cd7d7791b49a13c58fc18ffb4ae1aa53615c2e8bfca142a02ad4f7bdd02f0e46
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
new file mode 100644
index 000000000000..2193d772e351
--- /dev/null
+++ b/dev-ml/re2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ml</herd>
+</pkgmetadata>
diff --git a/dev-ml/re2/re2-109.55.02.ebuild b/dev-ml/re2/re2-109.55.02.ebuild
new file mode 100644
index 000000000000..41460a3125d5
--- /dev/null
+++ b/dev-ml/re2/re2-109.55.02.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/re2/re2-109.55.02.ebuild,v 1.1 2014/01/19 16:06:19 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="OCaml bindings for RE2"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:=
+	dev-ml/core:=
+	dev-ml/bin-prot:=
+	dev-ml/sexplib:=
+	dev-ml/comparelib:=
+	dev-libs/re2:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/res/Manifest b/dev-ml/res/Manifest
index 9062d8d15039..3624fbaf6b06 100644
--- a/dev-ml/res/Manifest
+++ b/dev-ml/res/Manifest
@@ -1,2 +1,2 @@
-DIST res-4.0.2.tar.gz 69538 SHA256 4f3e0a62c57ac1293ec119e94ecff2f404cd9196e71c276bd6c3855731af0d7e SHA512 08d671d3f6ec8a4c6ec4bfdff2a0f40c56f0da0b00b83de52c84b696258a44a8d0b9d195d1eb4489c6991b60619c8b06fd610d65e3e058e73d01b54a825d76a6 WHIRLPOOL 857402e4afd2b4ddb9ef5b67ec72821979e042408d4fa0d6f3bb2d88d63c1d80afe2b90c6da2f5ebd8bce570c6544f2c5632276404922fb429af54f46808b1c7
 DIST res-4.0.3.tar.gz 69587 SHA256 264319e586b2695f4ce453eb950546f4898875bed11df5e514f84c8670269b5e SHA512 5da4720dc61d66164bde98bb3b686bad081d79dfde2e6b63b387d25edd7f9e361b37de3e542166e1a9a0b0e97e85d664f3cd61659b748a6cb9c747ee97a206ce WHIRLPOOL 91b83a6e81627315fa83b23176079a64f99a40003fbe9541644bc4edb6c1492dfc226272475ca4b8e04b7852a4e621c89693e75cc7025f7683a1bbc94a9d919a
+DIST res-4.0.4.tar.gz 72603 SHA256 bac9fddebca10e5cdb364babc49e62df0f6289cdadf3cef2810d9b4b81e23bd1 SHA512 a0ce715f78d71ffabcf8ce198ab0511e50fc2500c567f01c9c41fd7cca4b626da1500d18afb76cd87372410b03223f9dfa874a8120a7ee96b91f12bd5707fb57 WHIRLPOOL f512653024a963b587c56bf3e972286d6d215b8908005910a9b722e862f676f446c04794b9addb578b3f1a8ab344ef8a70c4c2ae0605d755de8fe2cf91c6f70b
diff --git a/dev-ml/res/res-4.0.2.ebuild b/dev-ml/res/res-4.0.4.ebuild
similarity index 76%
rename from dev-ml/res/res-4.0.2.ebuild
rename to dev-ml/res/res-4.0.4.ebuild
index bc973c7611ba..bb34be860c64 100644
--- a/dev-ml/res/res-4.0.2.ebuild
+++ b/dev-ml/res/res-4.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-4.0.2.ebuild,v 1.5 2013/02/12 16:59:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-4.0.4.ebuild,v 1.1 2014/01/19 12:36:16 aballier Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 7307dd310090..fcc6ac00f5ac 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1 +1,2 @@
 DIST sexplib-109.20.00.tar.gz 115211 SHA256 8d8d20809a70193ee5ef34da90cc86b7f3c119a176f5d7d2f057897ad9042ec9 SHA512 222b2efd1a694262a1e722e5938e795feff12095c7fadc8d7bacffefdda55d904c695efd3bfa5fbbb1cf52084184803be1c8ec5da2fbf2d4ce2ffd92c721d48c WHIRLPOOL 3eb4e91fb74b032947a66dca1ad00fe94c8f4872ecbdc563f6fffe47106559f4ea19a0f2993423228fd94a609a254cc2c0eeb2d1da0376e14c30a138ca08907b
+DIST sexplib-109.60.00.tar.gz 130817 SHA256 d71707ed0d5c89328942706ee10d4c76e6a4d955e17aa8fa892e963db11b3425 SHA512 2140342052bf104f710c3208f76051745e3a5f44ea954503d3f1cdb915788bb67cd767a1f6d92249187bbf7dd9eb6486b99d41660664569f365fd622997c8211 WHIRLPOOL ca2f46851090188c892772193eda8ae9143039c72a9a25b210fddef5e7ed6fe4a97d812b4d16168f92c3590b75c994d71100e51e27bb1e9c95920011c04bb164
diff --git a/dev-ml/sexplib/sexplib-109.60.00.ebuild b/dev-ml/sexplib/sexplib-109.60.00.ebuild
new file mode 100644
index 000000000000..d8afb880cf0c
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-109.60.00.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/sexplib/sexplib-109.60.00.ebuild,v 1.1 2014/01/19 13:34:35 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-ml/type-conv-${PV}:="
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" "CHANGES.txt" )
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index 9c0f0db01100..552adaa4871e 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1,2 +1,3 @@
 DIST textutils-109.35.00.tar.gz 52347 SHA256 e736077be59f5fb7f0d77c57962f2221d4edbdab32b47ef77ceb03c4b5a96021 SHA512 b0b103d536988bee41bf04817044433b3ff798f411f33129142475efc38b185789660f6dca648410ec23db8a57acf2915ea9a7465663c371d962d0eff2b7f24d WHIRLPOOL 148a49ee510909fc3a9eebf2b676e3a331059778a28c37cd358fe4141432a5099e3fc182564380ebb4eeafecb03044b2325963cdf5eb0f61850c4eb61b3848c2
 DIST textutils-109.36.00.tar.gz 52483 SHA256 6bb07d839b4faee34d5f39e3cfba6658efecd17cea2b667f3980ac26baee2810 SHA512 979a570ef511aec99ac3c887b85a1f176cab8a0ba1397db9f1ee27d9586fe1c207c7596fd29d97aa2dfde85342ee01dc14b42157812bba19154c959298532013 WHIRLPOOL 8b7f00d12039f552021c87de5842b454b3e307f15cca665a4cf80085e10f9ba362b5de23941a0ba2302e3b2cf2dcec996d1d71abd63afccc0d8ee63e48cb3fb9
+DIST textutils-109.53.02.tar.gz 56535 SHA256 7b6627a33475b10ce93d73d5660367860ed8e2cd6967f22070db3671cc0952ef SHA512 223bc55e782d2908442832753704ee256b56270b2f7f489a3b6440efd60087342be2b8a1d36db4969358c212943a26e916bcf460a61dc8acbd73c0edeb04b3fa WHIRLPOOL 7bfb3fdc03490f4a0a4bf290d3de933f5ff96ca6c414c8edc12488669ac36edddeea660828a6b60a6d43450f6ea47cc151f7b2587418279a41aae764ea4dbf41
diff --git a/dev-ml/textutils/textutils-109.53.02.ebuild b/dev-ml/textutils/textutils-109.53.02.ebuild
new file mode 100644
index 000000000000..9149d13a9979
--- /dev/null
+++ b/dev-ml/textutils/textutils-109.53.02.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/textutils/textutils-109.53.02.ebuild,v 1.1 2014/01/19 16:31:40 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+DESCRIPTION="Text output utilities"
+HOMEPAGE="https://ocaml.janestreet.com/"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-ml/core-109.24.00:=
+	>=dev-ml/pa_ounit-109.18.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	dev-ml/async:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/type-conv/Manifest b/dev-ml/type-conv/Manifest
index 8087b9ba59cc..9e1891fb2386 100644
--- a/dev-ml/type-conv/Manifest
+++ b/dev-ml/type-conv/Manifest
@@ -1 +1,2 @@
 DIST type_conv-109.28.00.tar.gz 58375 SHA256 b868c88ce550178835660692d6dfab14a7d3b3b992b02669779b532e4c6c89f0 SHA512 67ddeea3630ecc0fd23c87a78787f352cfd6da56a5b2bae52a27da23b83ad9f47fdd04c0fcc48f90bcd5d6ad9ea7639dff725b68b8496bf12a2d033ed882c78f WHIRLPOOL 0a4d2176576c4ff987d9d53cc2c06a95fa431f371384d114f534072bc6514d22ff5922e8302161680d64daa08df2f8c10647fb8ec551238c2eb0cedddfce517b
+DIST type_conv-109.60.00.tar.gz 61937 SHA256 c29cdd92c8942861ec1b767f3179e8466f9f62cd8401fee0867acee592fd84fc SHA512 bbf6a9d3f99920b06e549fecc53811606b95fe09b16d6dedd88ff0260eac03b46a80c83ffd2e7ece059fa6a8ebbae0a7961ae671bd3fbda4fbba33b08ada3053 WHIRLPOOL 48b1b8f9780151b325b3be33d83671b9813bdfc309c02e51e59749417a8e7ef25ca7bf447edbfebe0f518edc0ba5269037adf24e28d0636c8a274b9fc0b16349
diff --git a/dev-ml/type-conv/type-conv-109.60.00.ebuild b/dev-ml/type-conv/type-conv-109.60.00.ebuild
new file mode 100644
index 000000000000..d863f206ca2c
--- /dev/null
+++ b/dev-ml/type-conv/type-conv-109.60.00.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/type-conv/type-conv-109.60.00.ebuild,v 1.1 2014/01/19 13:30:04 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Mini library required for some other preprocessing libraries"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-lang/ocaml-4.0[ocamlopt?]
+	>=dev-ml/findlib-1.3.2"
+
+DOCS=( "README.md" "CHANGES.txt" )
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
new file mode 100644
index 000000000000..0670f86704d0
--- /dev/null
+++ b/dev-ml/typerep/Manifest
@@ -0,0 +1 @@
+DIST typerep-109.55.02.tar.gz 140713 SHA256 dd2c473d416cc0d537aa33c1dfbd9374b93db049b709a8f88563aac8399ea014 SHA512 19e3cd88db93e42ce7a516d83b6fcec623c8ce60a4e02effc2b2221884d8c2d37d20d8f3b63da32bc1f7b9afeda6624c7043f2397579269451d2491f24088d78 WHIRLPOOL 44cb12802660345e1aaff3c0b54d2d317b8e8a9d3a1466ef3ec6940a68652e9cc0efe4b0076d5cf6e50f4cdb4f2d827cf2b1951bf4591d62fdad66625529af64
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
new file mode 100644
index 000000000000..2193d772e351
--- /dev/null
+++ b/dev-ml/typerep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ml</herd>
+</pkgmetadata>
diff --git a/dev-ml/typerep/typerep-109.55.02.ebuild b/dev-ml/typerep/typerep-109.55.02.ebuild
new file mode 100644
index 000000000000..951c6bc66ee7
--- /dev/null
+++ b/dev-ml/typerep/typerep-109.55.02.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/typerep/typerep-109.55.02.ebuild,v 1.1 2014/01/19 13:57:44 aballier Exp $
+
+EAPI="5"
+
+inherit oasis
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Library for creating runtime representation of OCaml types"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:=
+		dev-ml/sexplib:=
+		dev-ml/bin-prot:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index 2afd856d5225..9d96cf9d1ce9 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -1 +1,2 @@
 DIST variantslib-109.15.00.tar.gz 57154 SHA256 1ab28921e533121b27f6c4fa633277a05fbe3a642ad8c4228d403a06720f6245 SHA512 cfbe7bdf7e447a2f47daaef1b5c8af5063c3d560158582561ab944b411cde67b6cf5d27f5ba7d773621873e67f1f8b9a45cdc0dccc7cc2ea903ca8424d15f1d9 WHIRLPOOL 15c4849c6974e295e3da174356a3df25c95c13dc1e39e9a52df7c97ca7a9cd9d62d031fc005a63594b36ee9095e7c3039c5d9afbcf9cd90f70b94efdb84f34c7
+DIST variantslib-109.15.02.tar.gz 60251 SHA256 3f7bb9f2c9b9bf601a3d0a4a11b270ab6979213780b609060ab3ead9ab59eff4 SHA512 2cdd6c3f9fad0a8ea28357cbf80b69ccc3c73e74404cb4b5439c8c32f6a9f39cacc682cc7375f7a07e948191676506dcf64712869e28a2149d8b8cad5960e529 WHIRLPOOL faadffa83da47a2c4031ccca4696740cb9cecc619637be41f81aa3271a2ba875be0056f14ec13a7c9ab2232149d34e8096feca6f539c8b9ee269e24b4402e72d
diff --git a/dev-ml/variantslib/variantslib-109.15.02.ebuild b/dev-ml/variantslib/variantslib-109.15.02.ebuild
new file mode 100644
index 000000000000..b93ad2036cd5
--- /dev/null
+++ b/dev-ml/variantslib/variantslib-109.15.02.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/variantslib/variantslib-109.15.02.ebuild,v 1.1 2014/01/19 15:40:37 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="OCaml variants as first class values"
+HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/type-conv-${PV}:="
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" )
diff --git a/dev-perl/Clone/Clone-0.350.0.ebuild b/dev-perl/Clone/Clone-0.350.0.ebuild
index 5c67ca68595c..849765c0530d 100644
--- a/dev-perl/Clone/Clone-0.350.0.ebuild
+++ b/dev-perl/Clone/Clone-0.350.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Clone/Clone-0.350.0.ebuild,v 1.8 2014/01/18 20:00:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Clone/Clone-0.350.0.ebuild,v 1.9 2014/01/19 12:34:17 zlogene Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild
index f1c540d1ab91..909b4ec616fc 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild,v 1.7 2014/01/15 09:59:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Convert-BinHex/Convert-BinHex-1.123.0.ebuild,v 1.9 2014/01/19 15:56:05 zlogene Exp $
 
 EAPI=4
 
@@ -12,5 +12,5 @@ DESCRIPTION="Extract data from Macintosh BinHex files"
 
 SLOT="0"
 LICENSE="GPL-1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild
index 996c49d39854..c81a33e684f8 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild,v 1.1 2013/08/14 06:02:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-Symdump/Devel-Symdump-2.100.0.ebuild,v 1.2 2014/01/20 01:18:00 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit versionator perl-module
 DESCRIPTION="Dump symbol names or the symbol table"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Digest-MD4/Digest-MD4-1.500.0.ebuild b/dev-perl/Digest-MD4/Digest-MD4-1.500.0.ebuild
deleted file mode 100644
index 49ff20fa22bd..000000000000
--- a/dev-perl/Digest-MD4/Digest-MD4-1.500.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-MD4/Digest-MD4-1.500.0.ebuild,v 1.2 2011/09/03 21:04:27 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=MIKEM
-MODULE_VERSION=1.5
-MODULE_SECTION=DigestMD4
-inherit perl-module
-
-DESCRIPTION="MD4 message digest algorithm"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild b/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
index 64e402bf5447..2e29e2cf5a8e 100644
--- a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
+++ b/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild,v 1.5 2014/01/15 09:59:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild,v 1.8 2014/01/19 16:24:29 zlogene Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ inherit perl-module
 DESCRIPTION="MD4 message digest algorithm"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 SRC_TEST="do"
diff --git a/dev-perl/Digest-MD4/Digest-MD4-1.900.0.ebuild b/dev-perl/Digest-MD4/Digest-MD4-1.900.0.ebuild
deleted file mode 100644
index e62197492734..000000000000
--- a/dev-perl/Digest-MD4/Digest-MD4-1.900.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-MD4/Digest-MD4-1.900.0.ebuild,v 1.4 2014/01/04 13:28:59 maekke Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=MIKEM
-MODULE_VERSION=1.5
-MODULE_SECTION=DigestMD4
-inherit perl-module
-
-DESCRIPTION="MD4 message digest algorithm"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Digest-MD4/Manifest b/dev-perl/Digest-MD4/Manifest
index ea33dbefa970..f2a46a75c8a8 100644
--- a/dev-perl/Digest-MD4/Manifest
+++ b/dev-perl/Digest-MD4/Manifest
@@ -1,2 +1 @@
-DIST Digest-MD4-1.5.tar.gz 29442 SHA256 c7d7a32f5c2710c929b5688a7b057ec8ddbc51cf278f623e771fc02dcabd6a1f SHA512 36f6052d8683d09b05b031a99741a1df222d5c0ab4c7d3a96f3b2f34c8d9579d9c94702265fdab3e69203a50b20f9d0e2ef4aa866c4834b69a161e2172655b46 WHIRLPOOL fbfd2179dcdbbcea8b7d78d46b5c4139d0b270cbae25b3a8502f9b80f0e1884546e66a6e50039390369c0ff1c305388b440beb60f65f34e2b81acfbec4be398e
 DIST Digest-MD4-1.9.tar.gz 29304 SHA256 665110bba32470f398f311cd6462fd8975d7c83675ff674bc2f6c7b72b0caaa6 SHA512 618ac83de37c697e0ea1354383d755cbc4b097b2156a8ae0e83d9463822bc860733f2b064eb6b614b4ef6889460001a4aed2e1607e38d409e75dc9d1772b059b WHIRLPOOL 06e1b6ffa1127b706816d322f4be6f0a5d8c4ff45db384743cc45c8ae2b90f6c9bb0fef3b6ce7083651cb5b7ce0a54c13b6055d4908676d0a01ecdf6d65e456b
diff --git a/dev-perl/Fuse/Fuse-0.160.1.ebuild b/dev-perl/Fuse/Fuse-0.160.1.ebuild
index c41567225400..b2111bab383e 100644
--- a/dev-perl/Fuse/Fuse-0.160.1.ebuild
+++ b/dev-perl/Fuse/Fuse-0.160.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Fuse/Fuse-0.160.1.ebuild,v 1.1 2013/11/03 11:49:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Fuse/Fuse-0.160.1.ebuild,v 1.2 2014/01/19 19:04:14 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Fuse module for perl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-fs/fuse"
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild
index a6c20df73597..c85db15bc476 100644
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild,v 1.1 2013/09/12 15:29:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.0.1-r1.ebuild,v 1.2 2014/01/20 01:19:16 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="HTTP content negotiation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild b/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild
index 0bf87cb6c93c..3019865552b0 100644
--- a/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild
+++ b/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild,v 1.3 2013/12/01 14:44:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-IP/IO-Socket-IP-0.230.0.ebuild,v 1.4 2014/01/19 09:01:00 pacho Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION='A drop-in replacement for IO::Socket::INET supporting both IPv4 and IPv6'
 
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild
index 7744853c9cee..dfc4a0c8f598 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild,v 1.1 2013/09/12 15:51:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r1.ebuild,v 1.2 2014/01/20 01:19:50 jer Exp $
 
 EAPI=5
 
@@ -11,6 +11,6 @@ inherit perl-module
 DESCRIPTION="Abstract base class for portable servers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 SRC_TEST="broken"
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild
new file mode 100644
index 000000000000..dd088b1c8cf6
--- /dev/null
+++ b/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PlRPC/PlRPC-0.202.0-r2.ebuild,v 1.2 2014/01/20 01:15:46 jer Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MNOONING
+MODULE_SECTION=${PN}
+MODULE_VERSION=0.2020
+inherit perl-module
+
+S=${WORKDIR}/${PN}
+
+DESCRIPTION="The Perl RPC Module"
+
+SLOT="0"
+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=">=virtual/perl-Storable-1.0.7
+	>=dev-perl/Net-Daemon-0.34"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/perldoc-remove.patch"
+	  "${FILESDIR}/Security-notice-on-Storable-and-reply-attack.patch" )
+
+src_test() {
+	PERL_DL_NONLAZY=1 /usr/bin/perl \
+		"-MExtUtils::Command::MM" \
+		"-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/*.t
+}
diff --git a/dev-perl/PlRPC/files/Security-notice-on-Storable-and-reply-attack.patch b/dev-perl/PlRPC/files/Security-notice-on-Storable-and-reply-attack.patch
new file mode 100644
index 000000000000..877e7bc816dc
--- /dev/null
+++ b/dev-perl/PlRPC/files/Security-notice-on-Storable-and-reply-attack.patch
@@ -0,0 +1,105 @@
+From 29f5ad4805a04e4c4fd18795f7153798c80a46ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 18 Nov 2013 12:20:52 +0100
+Subject: [PATCH] Security notice on Storable and reply attack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ README              | 16 ++++++++++++++++
+ lib/RPC/PlServer.pm | 15 +++++++++++++++
+ 2 files changed, 31 insertions(+)
+
+diff --git a/README b/README
+index 8a68657..48a33e4 100644
+--- a/README
++++ b/README
+@@ -204,6 +204,7 @@ EXAMPLE
+         require RPC::PlServer;
+         require MD5;
+ 
++
+         package MD5_Server;  # Clients need to request application
+                              # "MD5_Server"
+ 
+@@ -245,6 +246,10 @@ SECURITY
+     that I missed something. Security was a design goal, but not *the*
+     design goal. (A well known problem ...)
+ 
++    Due to implementation of PlRPC, it's hard to use internal authentication
++    mechanisms properly to achieve secured remote calls. Therefore users are
++    advised to use an external authentication mechanism like TLS or IPsec.
++
+     I highly recommend the following design principles:
+ 
+   Protection against "trusted" users
+@@ -263,6 +268,14 @@ SECURITY
+     Be restrictive
+         Think twice, before you give a client access to a method.
+ 
++    Use of Storable
++        Storable module used for serialization and deserialization
++        underneath is inherently insecure. Deserialized data can contain
++        objects which lead to loading foreign modules and executing possible
++        attached destructors. Do not accept host-based unauthorized
++        connections. The Storable module is exercised before checking user
++        password.
++
+     perlsec
+         And just in case I forgot it: Read the "perlsec" man page. :-)
+ 
+@@ -283,6 +296,9 @@ SECURITY
+         authorized, you should switch to a user based key. See the
+         DBI::ProxyServer for an example.
+ 
++        Please note PlRPC encryption does not protect from reply attacks.
++        You should have implement it on the application or the cipher level.
++
+ AUTHOR AND COPYRIGHT
+     The PlRPC-modules are
+ 
+diff --git a/lib/RPC/PlServer.pm b/lib/RPC/PlServer.pm
+index 10b56c9..ce38594 100644
+--- a/lib/RPC/PlServer.pm
++++ b/lib/RPC/PlServer.pm
+@@ -613,6 +613,10 @@ I did my best to avoid security problems, but it is more than likely,
+ that I missed something. Security was a design goal, but not *the*
+ design goal. (A well known problem ...)
+ 
++Due to implementation of PlRPC, it's hard to use internal authentication
++mechanisms properly to achieve secured remote calls. Therefore users are
++advised to use an external authentication mechanism like TLS or IPsec.
++
+ I highly recommend the following design principles:
+ 
+ =head2 Protection against "trusted" users
+@@ -637,6 +641,14 @@ object handle is valid before coercing a method on it.
+ 
+ Think twice, before you give a client access to a method.
+ 
++=item Use of Storable
++
++L<Storable> module used for serialization and deserialization underneath is
++inherently insecure. Deserialized data can contain objects which lead to
++loading foreign modules and executing possible attached destructors. Do not
++accept host-based unauthorized connections. The L<Storable> module is
++exercised before checking user password.
++
+ =item perlsec
+ 
+ And just in case I forgot it: Read the C<perlsec> man page. :-)
+@@ -667,6 +679,9 @@ login phase, where to use a host based key. As soon as the user
+ has authorized, you should switch to a user based key. See the
+ DBI::ProxyServer for an example.
+ 
++Please note PlRPC encryption does not protect from reply attacks. You should
++have implement it on the application or the cipher level.
++
+ =back
+ 
+ =head1 AUTHOR AND COPYRIGHT
+-- 
+1.8.3.1
+
diff --git a/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild b/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild
index f60216b4e046..ecc4de53d9e5 100644
--- a/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild
+++ b/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild,v 1.1 2013/09/14 13:09:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Return-Value/Return-Value-1.666.1-r1.ebuild,v 1.2 2014/01/19 19:50:43 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Polymorphic Return Values"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Return-Value/Return-Value-1.666.1.ebuild b/dev-perl/Return-Value/Return-Value-1.666.1.ebuild
deleted file mode 100644
index 9f7e11a274e3..000000000000
--- a/dev-perl/Return-Value/Return-Value-1.666.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Return-Value/Return-Value-1.666.1.ebuild,v 1.5 2012/03/02 21:39:35 ranger Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.666001
-inherit perl-module
-
-DESCRIPTION="Polymorphic Return Values"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild b/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild
index 7250ff16790a..786a96f061e7 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild,v 1.8 2014/01/18 20:08:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/TermReadKey/TermReadKey-2.300.200.ebuild,v 1.10 2014/01/19 12:02:38 zlogene Exp $
 
 EAPI=4
 
@@ -12,5 +12,5 @@ DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 LICENSE="TermReadKey"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
index 5ad9c0861f25..2688883549b1 100644
--- a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild,v 1.15 2012/07/05 11:05:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild,v 1.16 2014/01/19 21:10:44 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="US-ASCII transliterations of Unicode text"
 
 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 arm64 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=""
 
 SRC_TEST=do
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild
index 1a54d0926866..12235e9b0804 100644
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild,v 1.10 2013/02/07 21:56:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.320.0.ebuild,v 1.11 2014/01/19 21:09:29 vapier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="East Asian Width properties"
 
 LICENSE="CC0-1.0"
 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 arm64 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=""
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild
index 276fba77228b..9b8148ae1212 100644
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild,v 1.2 2013/02/07 21:56:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0.ebuild,v 1.4 2014/01/20 01:17:12 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="East Asian Width properties"
 
 LICENSE="CC0-1.0"
 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 ~arm64 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=""
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/ZMQ-LibZMQ2/Manifest b/dev-perl/ZMQ-LibZMQ2/Manifest
index 48e254708244..ad4a8ec9398f 100644
--- a/dev-perl/ZMQ-LibZMQ2/Manifest
+++ b/dev-perl/ZMQ-LibZMQ2/Manifest
@@ -1,2 +1 @@
-DIST ZMQ-LibZMQ2-1.03.tar.gz 53864 SHA256 2beed8af00ae5f87ab62addf7a6d622a91a65d67b26bac097450fbcd23bbae0c SHA512 fed024b21f79a23621017d9a2ef76c85557f18f9461704e19ed3e7ab5b5d0e41d7af9391f7a01721229517b138c2906daf3276455cf6b50c2616e1d7325da005 WHIRLPOOL 729d579fb2a0dda89eb301043312cdbdca95af3cb87d74c64101e97795699c1e02bd1080ac0db78e292609c96a28138219072b068e9fe6caec98034faadb33c2
 DIST ZMQ-LibZMQ2-1.04.tar.gz 54197 SHA256 64afb994265c3865f3fc343bb31d4266c0d92eeb7542c1931828dbefc0876802 SHA512 98def0e2c5336d6cdd78ec502ec92f6147bc3812e245ecea8114dbbdd372402278202dbee6b07a83f69bb271067b479fffd3b4ff0ec6025930f27b522f044165 WHIRLPOOL 627fbddc2d66cbc0531e5f1636cc0e7c563d763feb46061021702da3960c2430502d43218cf8c51a41ccbe77f036cc8ba19881cdf2557b2cccc0b6c390d4f330
diff --git a/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.30.0.ebuild b/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.30.0.ebuild
deleted file mode 100644
index 0d809af88ab6..000000000000
--- a/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.30.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.30.0.ebuild,v 1.4 2012/12/17 18:27:57 ago Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=DMAKI
-MODULE_VERSION=1.03
-inherit perl-module
-
-DESCRIPTION="A libzmq 2.x wrapper for Perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	net-libs/zeromq
-	>=dev-perl/ZMQ-Constants-1.0.0
-	>=virtual/perl-XSLoader-0.20.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	virtual/pkgconfig
-	test? (
-		dev-perl/Test-Requires
-		dev-perl/Test-Fatal
-		>=dev-perl/Test-TCP-1.80.0
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild b/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild
index 0d4c49b1aa08..c88c3bdb1a9a 100644
--- a/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild
+++ b/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild,v 1.2 2013/11/19 12:35:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild,v 1.3 2014/01/19 16:58:38 zlogene Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	net-libs/zeromq
+	=net-libs/zeromq-2*
 	>=dev-perl/ZMQ-Constants-1.0.0
 	>=virtual/perl-XSLoader-0.20.0
 "
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 949543d0eee6..b6de55a9ca43 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.18 2013/11/06 05:25:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild,v 1.19 2014/01/19 20:28:17 vapier Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 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 arm64 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=""
 
 SRC_TEST=do
diff --git a/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild
index 31a2242da707..e30351f73cd9 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild,v 1.2 2013/12/23 14:30:39 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/libintl-perl/libintl-perl-1.230.0.ebuild,v 1.3 2014/01/19 20:28:17 vapier Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 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 ~arm64 ~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=""
 
 SRC_TEST=do
diff --git a/dev-perl/math-pari/math-pari-2.10.806.50.ebuild b/dev-perl/math-pari/math-pari-2.10.806.50.ebuild
index 75db743928ba..6dd49807d3e4 100644
--- a/dev-perl/math-pari/math-pari-2.10.806.50.ebuild
+++ b/dev-perl/math-pari/math-pari-2.10.806.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/math-pari-2.10.806.50.ebuild,v 1.3 2013/12/22 16:37:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/math-pari-2.10.806.50.ebuild,v 1.4 2014/01/19 16:40:04 pacho Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 # Math::Pari requires that a copy of the pari source in a parallel
diff --git a/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild
index 46cf0ac29dc2..faf0598cf23a 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild,v 1.8 2014/01/15 09:33:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.570.0.ebuild,v 1.10 2014/01/19 15:51:50 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="sasl xml ssl"
 
 RDEPEND="
diff --git a/dev-perl/yaml/yaml-0.840.0.ebuild b/dev-perl/yaml/yaml-0.840.0.ebuild
index 086709721f4c..0a4bbc2e4436 100644
--- a/dev-perl/yaml/yaml-0.840.0.ebuild
+++ b/dev-perl/yaml/yaml-0.840.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.840.0.ebuild,v 1.1 2012/07/14 09:28:04 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.840.0.ebuild,v 1.2 2014/01/20 01:21:02 jer 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-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
new file mode 100644
index 000000000000..443a75958292
--- /dev/null
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jaxml/jaxml-3.02-r1.ebuild,v 1.1 2014/01/20 03:11:52 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="XML generator written in Python"
+HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation http://pypi.python.org/pypi/jaxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 9d8dfb36f650..6ba227d36f38 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1 +1,2 @@
 DIST libvirt-python-1.2.0.tar.gz 140757 SHA256 2fe7e341cb1b35cff130b7a04d0d58f3607094e63cbca689bc16c7b47da0f52b SHA512 8aa1cd366897fd7657f0cecd189df56551c2a524c1f7d7c609d314c44046b0367d84af617a7591d4d7bb7708dfe66323f2156ed8a0144901bbf563b4f5133d80 WHIRLPOOL 092ed89cf8f0ebe0b22e59b2935d219d7d098b45ea3bf720cff37871595991e182edebe91dd6620aed0ef26fc9f5563d363f94487cfa04846d4094658f7e1c23
+DIST libvirt-python-1.2.1.tar.gz 145372 SHA256 bce558606b157d0717ee7bd6537d85dd4c0321c59b4235c967db7a3aad80e246 SHA512 26dcfdd70ea7270e510cee09a9d39ab64376be6aae2238defa96bf63be15f9edfaa69a34a8a7fb372b4d9681b3cc5c3f031b7d4d5d88403e594e88f5a3eece4a WHIRLPOOL 6cceaf6cae04603264983107f22eab5dd59ee59c6347486ec1c74a20affccf45899ba99a00ef4b508a9531a487e0cd2ad21087a0e1426035daae03c031dfdd7d
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.1.ebuild
new file mode 100644
index 000000000000..e503a9cee560
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libvirt-python/libvirt-python-1.2.1.ebuild,v 1.1 2014/01/19 22:34:34 cardoe Exp $
+
+EAPI=5
+
+#BACKPORTS=062ad8b2
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=app-emulation/libvirt-0.9.6:=[-python(-)]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml )"
+
+S="${WORKDIR}/${P%_rc*}"
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/platinfo/platinfo-0.15.0.ebuild b/dev-python/platinfo/platinfo-0.15.0.ebuild
deleted file mode 100644
index 785b246f7d86..000000000000
--- a/dev-python/platinfo/platinfo-0.15.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/platinfo/platinfo-0.15.0.ebuild,v 1.6 2013/07/06 16:05:39 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Determines and returns consistent names for platforms"
-HOMEPAGE="http://code.google.com/p/platinfo/"
-SRC_URI="http://platinfo.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pyelftools/pyelftools-0.21-r4.ebuild b/dev-python/pyelftools/pyelftools-0.21-r4.ebuild
index 761e23e43435..59b0396468dc 100644
--- a/dev-python/pyelftools/pyelftools-0.21-r4.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.21-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.21-r4.ebuild,v 1.7 2013/12/25 09:33:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelftools/pyelftools-0.21-r4.ebuild,v 1.8 2014/01/19 10:15:49 vapier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
index 274f5625443d..2cde1ea07dde 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.7 2014/01/16 20:17:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.8 2014/01/19 10:34:09 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
@@ -15,7 +15,7 @@ SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
+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"
 IUSE="examples ssl"
 
 DEPEND="ssl? ( dev-python/pyopenssl )"
diff --git a/dev-python/pypax/pypax-0.8.4.ebuild b/dev-python/pypax/pypax-0.8.4.ebuild
index 9fb746ef0863..7580cc9c1a08 100644
--- a/dev-python/pypax/pypax-0.8.4.ebuild
+++ b/dev-python/pypax/pypax-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.4.ebuild,v 1.6 2014/01/18 20:08:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.4.ebuild,v 1.7 2014/01/19 11:33:43 pacho Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/elfix-${PV}/scripts"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="+ptpax +xtpax"
 
 REQUIRED_USE="|| ( ptpax xtpax )"
diff --git a/dev-python/pyro/pyro-4.22.ebuild b/dev-python/pyro/pyro-4.22.ebuild
index e308c281734b..8dc4204b5107 100644
--- a/dev-python/pyro/pyro-4.22.ebuild
+++ b/dev-python/pyro/pyro-4.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.22.ebuild,v 1.2 2013/12/24 12:49:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.22.ebuild,v 1.3 2014/01/19 11:20:21 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="!dev-python/pyro:0
diff --git a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
index f8449d6b91b9..ce4fd7822de9 100644
--- a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
+++ b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild,v 1.4 2014/01/14 15:08:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild,v 1.5 2014/01/19 10:20:50 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="net-wireless/wireless-tools"
diff --git a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
index 0a8a511e031c..fddf618434a6 100644
--- a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
+++ b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild,v 1.4 2014/01/14 15:08:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild,v 1.5 2014/01/19 10:21:03 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/pyzor/pyzor-0.5.0-r2.ebuild b/dev-python/pyzor/pyzor-0.5.0-r2.ebuild
index 17b49e6d4df9..6f92cfd05fce 100644
--- a/dev-python/pyzor/pyzor-0.5.0-r2.ebuild
+++ b/dev-python/pyzor/pyzor-0.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.5.0-r2.ebuild,v 1.4 2014/01/18 18:52:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.5.0-r2.ebuild,v 1.5 2014/01/19 10:34:22 ago Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="pyzord"
 
 DEPEND=""
diff --git a/dev-python/serpent/serpent-1.4.ebuild b/dev-python/serpent/serpent-1.4.ebuild
index 38519c4cc6ae..335ed717e0c4 100644
--- a/dev-python/serpent/serpent-1.4.ebuild
+++ b/dev-python/serpent/serpent-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.4.ebuild,v 1.2 2013/12/24 12:49:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.4.ebuild,v 1.3 2014/01/19 11:20:39 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index a554e8694273..af9ad74c3c31 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -5,3 +5,4 @@ DIST TwistedConch-12.0.0.tar.bz2 214365 SHA256 b66249b32186eb3bc82ef3d2be4165809
 DIST TwistedConch-12.2.0.tar.bz2 223359 SHA256 2d1d6d4dcf8a6c9fd7f7c03e74111049566618765f93fae1da999643caf13cd2 SHA512 6b81ed588aeb568e14ad341530ebceabd34e3025da612aa54effe0ff96ff6c20c466b296795209b6ee761890d27f26075915de114459dbc84547587444520da9 WHIRLPOOL bfd7bba0f8fe2cafdc44b733f93323e2f12ad76e6f7260ca82c9733cbc349f2603c8588485255caa3a99fdeebbf8d925d0e89e924aa35e45925172f40a974dbd
 DIST TwistedConch-12.3.0.tar.bz2 220999 SHA256 5d53e9c26c64e31168121565efbfeb117fc11de8d85cc94bee3fc0a1d189e49b SHA512 724820896e6ad7b407a5c89b81cc9f4950b12907e67eaf30bad040274215b2cb637731c78fd20b45f60d73f07e40acc74b7c1aa006378f39559c8b0ad22dff66 WHIRLPOOL 14a04e544c66049244728ce170b85d568522b610e62068fc449fb95e4ad13fc6a65593007ffd244b792d13136d75353f70607a7725cd82109f580f913a5bc00c
 DIST TwistedConch-13.0.0.tar.bz2 223663 SHA256 7ebbd2ff600a4ee7da3e683b22be4ad97db79ee3b0af0c2758ca3f3788cf9ef2 SHA512 80fc9e2ca1ebd5477964c0de4d0050f1e8ff81ad5f02f836bfa7dd20be487763add83b4df2a038b9cd6066b82cfee2dad932b0f6f7bcbd67428b6babddc3afb0 WHIRLPOOL 2b4b8599f28c0a5980903d0e678a3e05d4bac99a0bc5aa3db6f2fe0bfb3b6336434678f680fc8e3afeb443c470e10e9b08a28dfc7a02cd2ae0a070e7d4258de5
+DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4dae73226429b26bf2983dc7d1df86cc69 SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043 WHIRLPOOL 7ddf201c17f6625cac09197bfc1b532d1f6f8bd01b888668ccb16b5577b235a3379af11e436e0a4ed308218b6fc27e1250841367dc8c191bc420f4a90a7a2a49
diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
new file mode 100644
index 000000000000..9026f61f814f
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild,v 1.1 2014/01/20 07:03:22 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
+		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index c96789780ff3..7b2c98f8e29d 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -5,3 +5,4 @@ DIST TwistedCore-12.0.0.tar.bz2 1394195 SHA256 b5414a0da8e18ff97cfcb246fa61fc417
 DIST TwistedCore-12.2.0.tar.bz2 1431188 SHA256 a09316a164597cb3ed54621e6e5bc72ba8f3a83544cb90375a14535ae487d2ea SHA512 843600df91812766f0264a04146415c6ce33c9e54f74887206512a65a1503e12895d8c363b33685c2035e81d309d672d0f6944e28e8b48b86232e2b055e879e8 WHIRLPOOL e9335d45b1bac97081af032cb8b6f33f28c9674f1c7223c3fbbe98a2d2c55188541bf4767af7c803e615df8eaa7f10f3abede3f622bfbccecd51d60afc2546bf
 DIST TwistedCore-12.3.0.tar.bz2 1480622 SHA256 343dd7372b05d4aa0805406bcbee7db40514b6bb48aa2840e0e56d88a8970900 SHA512 86e9bbd4b8b0b5f70b62757f9ce93fd03c2766b4cb9722028ec7863d1b9dd19e6d3771472a86f1373a8320a98f5081ac76400ac6bb25a950b6fc50fb241ebeb8 WHIRLPOOL 77cb88bd53a5c489ad8781ebef10987766dfd42d8ad3bcd599b9ba2bbc77cf41bee8507a29727cb6d88590d8cb2ac118b1eeb553c034107513502cf7ae62f6aa
 DIST TwistedCore-13.0.0.tar.bz2 1495753 SHA256 989706fd39c8a28785bdecaa0145b81f7e159b9209d463b5885be7e5c34ff32f SHA512 624d73d267742cb5b97bed2a39e78caeb01ee5fa871a0a2133455809b1d2a695f0d375c022ae21e91ef20f92fdee05a08a11db7b6b1e92ec810d3e097f929972 WHIRLPOOL 02c25eb94ad0aaafea8e1599df387607c6a1323ac55c31b0e98a366f927da2245fc839f5a3509367ed18690694f8599ebb22c0b21b8c90dfbfe2e3727a7846ff
+DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
new file mode 100644
index 000000000000..0275c6cb3b3f
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-13.2.0.ebuild,v 1.1 2014/01/19 08:09:58 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial"
+
+DEPEND=">=net-zope/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Give a load-sensitive test a better chance of succeeding.
+	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Skip a test if twisted conch is not available
+	# (see Twisted ticket #5703)
+	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local CFLAGS CXXFLAGS
+
+	if [[ ${EPYTHON} != python3* ]]; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
+	# expected
+
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
+	# I currently lack the cycles to track this failure down.
+	rm twisted/scripts/test/test_tap2rpm.py
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920
+	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web creating a cric. dep
+	rm -f twisted/python/test/test_release.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index ced259fa6b19..fd1d900a1ce7 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -5,3 +5,4 @@ DIST TwistedLore-12.0.0.tar.bz2 87051 SHA256 f50442f218ca6103b899732287c8671ebdd
 DIST TwistedLore-12.2.0.tar.bz2 87248 SHA256 e3d95400c0579fcf6174cd52a4ab6a1d5a80f8bf994e3c139e7baa7ff942acdb SHA512 148932ba302ee713273cf9a89fd56e3875aa2ec4c2d639923cbb4be81fe12fb45c0c8e5379cb710098e8084ae3fce85d248e2843abcee656b094670a31223d12 WHIRLPOOL efdde3924c7e4276490fa475a78f56ad4a19ac69baed65804650d94bb4d6f409050d380140cf06fef09b64c7728f4bf9de0cdc776dd84a2e075bda539ff95f89
 DIST TwistedLore-12.3.0.tar.bz2 87279 SHA256 60f90836eb0eb8dc10aff3c7d369ecfd505bd050b5555def0cec7ab88af0f909 SHA512 c07c792e33c7b75788a068b4f385758e4e13bf9e650713ce455f7da64932fc464b43068b75592dca82826802f9cda7d13f11bc7a8dbb0470a0c80ca65f617925 WHIRLPOOL 49b286b0a20790c3ad6fc7105ad16a91b0c4ac52834c03f99d00c2745b6361537b645beba17ec408bce14626554dcfc9530ad33ad340932242879bfb3ba61c50
 DIST TwistedLore-13.0.0.tar.bz2 87133 SHA256 7874ecb0f79b015fb6183cf181f86ee96469b4e7420c0ff6d1028867d18777cc SHA512 783d5ccba84351f0bacf591d6b3c13765bb9e04bc3e89f217f2d52ff050a79d4b85ef6108bd00f706295928941082bb384e9c6a73171150ffde77d0826f9597e WHIRLPOOL a0550825038429176e36156d8fed4cbca1626afa3228c83cd837d746153acf5490eb1170592af27312abb8e64f380d623aa73af56b05ef1793327b7a2a37a6ef
+DIST TwistedLore-13.2.0.tar.bz2 88616 SHA256 53ca37c533048ddaf209548a21bf3078cb56dce48099251fb6bae107ed9d66df SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6 WHIRLPOOL 380309ec38864a53605e4ab321b61d316f9edfad0696070f958151f66c0775f29b31e75305e94272cbcdb08210f35f0e43d4c717af521b29538ea9aec08b5fd3
diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
new file mode 100644
index 000000000000..a6fc8e7cd3b4
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild,v 1.1 2014/01/20 08:26:24 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index 45e0ae8227f2..28fce2d96824 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -5,3 +5,4 @@ DIST TwistedMail-12.0.0.tar.bz2 146270 SHA256 680ec9964c6a75c89c7470dba4d6423d14
 DIST TwistedMail-12.2.0.tar.bz2 153068 SHA256 afa0240bfdf28ea215945858f71b48425c496dc035fc4e2005474bdffa327105 SHA512 22ddb8eea9c594e6c783f7eaaad982c2c5c12a019a815e81162807ec633af1d5052e644d0b287b7b0cdf4114e910e30c1d5f469ddfbd3b4de9bcee1ac69fea5c WHIRLPOOL edc31226802ff585fccdacacbc5197dffcc57080c10c9aeee96c4fc1d471c55c230da8a358e70ee1e11627c358c43e216908fa4c12be9f6be5b10baf7ba0f53b
 DIST TwistedMail-12.3.0.tar.bz2 154204 SHA256 339f04f9d49f9be2945086c7d1ffb530bcbc653ae0151d3fa0bd899ad82034b0 SHA512 9e6b5eaddfe7ec460b702a9c376c5c4e98cc2e5ea2b1c2bde87ddb93fd49eb9be1d489e7a2d3f56b1e281c79acb3a7a02a7e41268c0c2844e4aaf29fbce5e251 WHIRLPOOL 1a4f781eb1fa14181690e6a2a19cf125bafd8be59de835b82814ea48b344a596bda93fa3b716a9feaa411e6a06fb617ecac6711977ffe0746c4064812bd8ee67
 DIST TwistedMail-13.0.0.tar.bz2 156220 SHA256 ff9c231dc9f1603374363ca7e5cb30c253032f551a02ca8ef74f0d5adcb99b2e SHA512 7d4be4d8bed37743696430aef4a827bdbaf7a5ea094259ef6fc7612955d95f3ef6b10cd08a6af5cf4111608ef93e07701be2f945e507f7c5c62e0997018e5b3f WHIRLPOOL c17423fd13b04a7a8f2a73883407e5b61d07d88dc849b86f44c6220a3f188badb4f0fa2ef9321d121460a1a0203b8c2622bbb4dcfe51257c2d2b161da00e87aa
+DIST TwistedMail-13.2.0.tar.bz2 160046 SHA256 6e4b3844a27bc1f85ae7529bf1c0574f6962c8ca66e08c3c06c2a5a2e39acfc8 SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314 WHIRLPOOL 274f5f60564d94beea5c4a4aa1593de4e602aa7f3fdd6cecfc25ab543d90e177e94b1a73c2857f00f870e3d37b0b427e31f424240fd499ec759ab16ee8797adf
diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
new file mode 100644
index 000000000000..c36cf7e6ab97
--- /dev/null
+++ b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild,v 1.1 2014/01/20 08:38:08 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index d637c9792183..4847e510d544 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -5,3 +5,4 @@ DIST TwistedNames-12.0.0.tar.bz2 55023 SHA256 41b8995d10d210f26433c4311a67935652
 DIST TwistedNames-12.2.0.tar.bz2 58738 SHA256 d8cb9cd2cb621ad0874cf6cc7efd48ec86c0c664527671b0e481196366d44794 SHA512 1de1eb983644490cf84c51233e7339541c5d51447ec660387058eaef0def9bca63a4cbe6a2917d0049ae413afbe9bf8621f08ee2784ea0833373cd4428b20995 WHIRLPOOL 861fe8f4f39f4468badd817e4a7372ed8ea37c92ac85a427cf3930d89c1dfcbf60033def4d33d204fac784d595ac5fe67e300eee9f884574b65393746a7ed9d5
 DIST TwistedNames-12.3.0.tar.bz2 62310 SHA256 0e125aee9ef0025527cd30fb91ba6b520b237402629bfabdbb40148aec31156a SHA512 c77c99fabaa1d778852a4310207b452a17b2aa3c3241c250055a0f56b4eaf4aaa72c2e005318d10792f2b1c563568f28efda62fa5ff14b5a2b82c05ce4d58143 WHIRLPOOL 536161b53c64d8bf0e80fd456e4697861c0768a5976c47a053bd7aa221f2787e290f97ffbb79d496dbe7ec5fafd475adbc80fd4f304df07ac927e8c1ae0bfb83
 DIST TwistedNames-13.0.0.tar.bz2 60955 SHA256 831741ec0abaf6fc13469d172152212ab3e8c112b0313c2c0614348e3f32d575 SHA512 37a4f4dc311243d18752cf9f27a0d65a9c6efa9600f59060e4bd62100863d7b14076d1e1fea51a0fdca67a5807803ebf36c262f44ee80ce2bf14ef1e1512639d WHIRLPOOL e99e693b7b0d551ddc45bcac4562d419557730447e0d6767ba6ee42c622a199b63f75855bab0c7d61a4902306cf2776f666effd5d25403a3ed2069ce793e3e7a
+DIST TwistedNames-13.2.0.tar.bz2 71127 SHA256 b8ed07790661eac454ee0bc424f9ede649dec87c11d423421ce2808795e131d5 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5 WHIRLPOOL b6d116781c9dbb408b0eac3fcd7c9ee5259e6d92fd6b7c737168dac14a6534c4f9f684170b6e0103f68703600284da68afb7dfc98f0d0d85117373ae41599053
diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
new file mode 100644
index 000000000000..de51f2ecc6c1
--- /dev/null
+++ b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-13.2.0.ebuild,v 1.1 2014/01/20 08:30:26 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
index 6bf9d8f183ea..70e75ef69763 100644
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@@ -3,3 +3,4 @@ DIST TwistedPair-12.0.0.tar.bz2 9154 SHA256 3d3b7e8b764618b0ede57adb72a5affe7de2
 DIST TwistedPair-12.2.0.tar.bz2 9184 SHA256 a795a5dbb0660559aaae441f12736818106ec27283bff3159e42191ee2e00aed SHA512 17594efd6a55554153de28da39ac0d6d8bd78bfe348e7222312f91a8c7d85b42bf54c2aa0ba6022df3f5e6168dd86f38473637d79faa7c2d7ac4873bb4a3b0a2 WHIRLPOOL f18c33c8abe159adc96f6c617f0b671ddee85e7c6c3d4260f88d8babccabb11a01764b02bf9c079d714d44a28f5adf74f0dd68feaee4fed320c44eb619572662
 DIST TwistedPair-12.3.0.tar.bz2 9189 SHA256 ac5d9e9bef93982685e514c4001bbaa22bf0fd2733d82f9e061f0461859600fc SHA512 375bd518e8cc6f00fb2cbb1f7f3bed87cc233f322f1727eee7c119c77ff7ec1f5841b4bbb114ba301ebec144255b0337678a463123de8f8d4827cd19c3db179a WHIRLPOOL e01f2ea00f80f095bb6c335340f1b4f9e8a28172658510d3674e799c00e59e872d3df6c59ecb286e07c3da3fb96e0b35f041e64204cf681fdd0db01d3e1e90ae
 DIST TwistedPair-13.0.0.tar.bz2 9187 SHA256 3773ea87a89e2cca402dc44015e14af0c8227a61d080f0e8d9deb801a4c04503 SHA512 66d9a51ec1a1a1075ac85aa5f157ffbf4158564ecb68ac74a9d52d72d0c58f70088efb463c4a7e17c187101aebbbc65e947a521661a862a6b6af7ee5aeafefe6 WHIRLPOOL bb6e0d45bb69605002891e2cd060da3aa23549a49426eb0f4422fefe744e17c27ec3e418686c26f7ff721ebb26d0420b0057f24b5660cc062d707773651ea12a
+DIST TwistedPair-13.2.0.tar.bz2 9251 SHA256 600c7dd1e9a4798540c16a7a94585a0e45e938b6f379ff863725bed85c91eb1d SHA512 931b2564e66d5056ce10695e7d9884b55d42c1081feaf9edc011aef9dff21f40e628312a89970f83619611967f155f26f4bbd9d1a325d30670e245e00f47e2d0 WHIRLPOOL 502e096358d0a92051f4b0179bb11d4884d5fac9bf4c4cd3e6b9620fa263f6ee69919c5bc89d7d9a427638e04694f19da529589bda88fa28faba610e8907625b
diff --git a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
new file mode 100644
index 000000000000..1d478567ea50
--- /dev/null
+++ b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild,v 1.1 2014/01/20 08:50:37 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/eunuchs[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index af8a81df1618..116fd1b0523f 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -5,3 +5,4 @@ DIST TwistedWeb-12.0.0.tar.bz2 374609 SHA256 ff6d0dad12f1928deca23c8d05a0cb9a340
 DIST TwistedWeb-12.2.0.tar.bz2 386461 SHA256 15b962fd7ca4f8079bca6d0f83fc28207d8671b13da4b598b25a52578866d309 SHA512 2d33e9716e004566c7c20dfda24317d5a3e994eadf2e419129ca26a750d7e75503930557ad6562e141e74a37ea2dc9fdb7d78a64cfe6d53ec9988a636a4aa1c2 WHIRLPOOL 80fe90c11ff432f81871f40fa8d841226fc7fdb0497f05608ff4bdf3840942023043d2dd76c3bbaf87ffd88005064fdc1a9a232a70ed9783674175fb21f6a7a3
 DIST TwistedWeb-12.3.0.tar.bz2 393179 SHA256 d13e220235788f5e2542c9f8f906fe79e59793f5212cd9862002ea084ea666ca SHA512 2c1d857a0f92b781cc683e59f7e0e16b6a1158b1a45a9b947635da2bbaf78f0988bcf6503ad58b6c5109ab710db3c2f860ac4d446654c55394c49fdc7dc5b3e4 WHIRLPOOL 59c4db46679d0c7de3b881256aee1e0a2c6a33e6a7a481554a3b9b419f172774ec28a30849d731479b1659a7eb6a30713bd033ec72ea5c6943cb15d09483dee1
 DIST TwistedWeb-13.0.0.tar.bz2 395974 SHA256 a3f6b3a47950d96a6da5cf28bf4c1e0bfa894ff2a1c38c38eac4876cac0bdc55 SHA512 d034a63a8d9a52f2db7967e57245a18ff288f1030579204286cc6d4990afe6fa30fb8aa73f62460ecaabaa76c1cc20be75aef0382f5c1bd565bef7923a9c86f8 WHIRLPOOL 93f8eab34be254c7f28aed1c95fcd9963f7038529a3d88ea014d0f2ea996f18955e3a672c89156d379b3fbe15822b21b0be0e7d35bf08bc6b0cf569607f87c0c
+DIST TwistedWeb-13.2.0.tar.bz2 403931 SHA256 aee160e0264d9dbaa0ec0613851128c91e3ac4246d3e9e13a6f2cfdfe7a4904f SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f WHIRLPOOL 9b6d02398cd29e763107338b7b0a2fd60f5ff9ea4d7578d179411c1e6470445621484cb532688d3d72f7634c5a119e52c5df86bfc462de0adf8da1ef875e3bf2
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
new file mode 100644
index 000000000000..716387dff1b4
--- /dev/null
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.2.0.ebuild,v 1.2 2014/01/20 04:04:28 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit twisted-r1
+
+MY_PN="TwistedWeb"
+DESCRIPTION="Twisted web server, programmable in Python"
+
+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="soap"
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
+# putting in question as to whether it is a testsuite
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild
index 986939e891b8..3b74189fa23d 100644
--- a/dev-qt/assistant/assistant-4.8.5.ebuild
+++ b/dev-qt/assistant/assistant-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.5.ebuild,v 1.7 2014/01/06 09:38:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.5.ebuild,v 1.8 2014/01/19 13:52:46 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild
index 6dbc6c7ef8ca..7efd1a0d4eb2 100644
--- a/dev-qt/designer/designer-4.8.5.ebuild
+++ b/dev-qt/designer/designer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v 1.9 2014/01/06 09:38:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v 1.10 2014/01/19 13:52:50 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild
index d86291a2b95c..e451025e96a8 100644
--- a/dev-qt/linguist/linguist-4.8.5.ebuild
+++ b/dev-qt/linguist/linguist-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-4.8.5.ebuild,v 1.10 2014/01/06 09:38:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-4.8.5.ebuild,v 1.11 2014/01/19 13:52:55 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
index 06fbae11fa60..d796b4248f24 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-4.8.5.ebuild,v 1.9 2014/01/06 09:38:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-4.8.5.ebuild,v 1.10 2014/01/19 13:52:59 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
index 2c5017b5bcc5..fd215d678121 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild,v 1.8 2014/01/06 09:38:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild,v 1.9 2014/01/19 13:53:04 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE=""
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild
index c8ad7ecee8e1..9902ce34370c 100644
--- a/dev-qt/qt3support/qt3support-4.8.5.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.5.ebuild,v 1.8 2014/01/06 09:38:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.5.ebuild,v 1.9 2014/01/19 13:53:09 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility"
 
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
index 8d523375e1aa..a3a1eb4393e2 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.5.ebuild,v 1.9 2014/01/06 09:38:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.5.ebuild,v 1.10 2014/01/19 13:53:14 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 IUSE="connman networkmanager"
 
diff --git a/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild b/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild
index c2ff2ead7f90..a7befdcdc584 100644
--- a/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild,v 1.8 2014/01/06 09:38:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild,v 1.9 2014/01/19 13:53:20 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv icu qt3support ssl"
 
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
index 426cb71dfd11..1a053811d216 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.5.ebuild,v 1.8 2014/01/06 09:38:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.5.ebuild,v 1.9 2014/01/19 13:53:24 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
index a333badf6f87..56bca79ed2b1 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild,v 1.9 2014/01/06 09:38:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild,v 1.10 2014/01/19 13:53:29 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 IUSE="+accessibility qt3support webkit"
 
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
index 01d6128fe278..c353f5eb2e9a 100644
--- a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.9 2014/01/06 09:38:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.10 2014/01/19 13:53:35 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
index c172bd37be19..c9c15881b492 100644
--- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.8 2014/01/06 09:38:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.9 2014/01/19 13:53:39 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
index 6fc5204c607b..0bd50361ba15 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.5.ebuild,v 1.8 2014/01/06 09:38:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.5.ebuild,v 1.9 2014/01/19 13:53:44 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="egl qt3support"
 
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild
index f7c23fd68621..facfb0a4f529 100644
--- a/dev-qt/qtscript/qtscript-4.8.5.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.5.ebuild,v 1.8 2014/01/06 09:38:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.5.ebuild,v 1.9 2014/01/19 13:53:49 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="iconv +jit"
 
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild
index ffb9f6fa4bee..a1cf0fa1a78d 100644
--- a/dev-qt/qtsql/qtsql-4.8.5.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.8 2014/01/06 09:38:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.9 2014/01/19 13:53:54 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
 
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
index 0a22af001526..3191a6d00509 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.5.ebuild,v 1.8 2014/01/06 09:38:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.5.ebuild,v 1.9 2014/01/19 13:53:59 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility"
 
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild
index ed53c6764a0e..b2e8cd2272ec 100644
--- a/dev-qt/qttest/qttest-4.8.5.ebuild
+++ b/dev-qt/qttest/qttest-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.5.ebuild,v 1.8 2014/01/06 09:38:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.5.ebuild,v 1.9 2014/01/19 13:54:04 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
index 606b070e4959..49fa26a815d3 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild,v 1.8 2014/01/06 09:39:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild,v 1.9 2014/01/19 13:54:08 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-ruby/bcat/bcat-0.6.2.ebuild b/dev-ruby/bcat/bcat-0.6.2.ebuild
index 2b2aff8280c3..eab7c4cd91aa 100644
--- a/dev-ruby/bcat/bcat-0.6.2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2.ebuild,v 1.12 2013/12/26 18:59:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2.ebuild,v 1.13 2014/01/19 09:22:37 pacho Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/rtomayko/bcat"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 # Collides on /usr/bin/bcat, bug 418301
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index aba55e36002b..a7283cbe6186 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -2,3 +2,4 @@ DIST bunny-0.6.0.gem 32256 SHA256 fb8142488e96124f1b880979d1006366f254323f555add
 DIST bunny-1.0.0.gem 166912 SHA256 399724a5aed55c2084c6215a93f9773a23ed28be90fdf9275a47137db89e526b SHA512 3dde20f019c06e72732206da229ce845cecd88b0a83d6bb0a6a50093af7ca67947e6534d31b10fea581efbb4ba82db7cca7ae2a43e21167d717d563722309a73 WHIRLPOOL 73901b4e90fe0bdd91691b9a9072cef939318c8cdcc43cce607029404282efe4ba2be15e5087bae39dfcb24378db79cf21bfe5e3eb91e32120edabf7478dc5ca
 DIST bunny-1.0.5.gem 168960 SHA256 7dcd78a2044d3df76fd7b82da2c699ef86a5947fd8fd368cbe7e20af42b6c272 SHA512 3465dd83347c66d0a9b0e16f12a239a6efb8f9a629e41322d7ce0f0922c951ba6e739afaa632e594fbbcef10705c06226db39ef90def5e94ed89d54ecd7a8015 WHIRLPOOL fc416fea502c8e83da1bb0f2cd4406ca89d3dec83a08afecc0b2b1a237bcbaa246f4fc0d72a95d42ecc8ef396b9e0118a820bb70b33a762469c8b7c7ccb893d0
 DIST bunny-1.0.7.gem 169472 SHA256 3f4a21967bc7a70bb7a4c25f60fa2168ce131df98297c20ff7303b9d8347917e SHA512 7e2af2c75e4b93aaf4ceae7656313ab55462bc594b5b3d69b59e1babcc15ec0d2bf3320d844ef087951cf79f83e9b56bb50ca46e025082b2f7896e2cb3b7e556 WHIRLPOOL 9875cca5f28c0df08f787ec0656e6c702fe24bcc9f58ba9f0781135f6d22ea3cefdbebcd19ffc4fc09ab765ece4738cce437b56f8afcaec6ce3d497aa3dd7a9f
+DIST bunny-1.1.0.gem 170496 SHA256 fe311120db1edd02920c90ef8782eff233904d75890c66ebdc2bdae88180b619 SHA512 5e76be89c338391207b877535ee5cdc3b7aa8c6bb92730975e11f862bfa093e93ee3e45debd9d2f3689059e0fcc32cc049aa32186537297c4427957be9f8ce21 WHIRLPOOL 330699abcb25fd0ab31bc807abaf8c68041d97cba57504d34ba746ea0e704a3f2a0de29cd0f109e12b1b33c1ab537a0b173a5004e4ac5a087a66da3dcb7b7af1
diff --git a/dev-ruby/bunny/bunny-1.1.0.ebuild b/dev-ruby/bunny/bunny-1.1.0.ebuild
new file mode 100644
index 000000000000..2ff1e4c92a98
--- /dev/null
+++ b/dev-ruby/bunny/bunny-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bunny/bunny-1.1.0.ebuild,v 1.1 2014/01/19 08:10:55 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="http://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/capistrano/capistrano-2.15.5.ebuild b/dev-ruby/capistrano/capistrano-2.15.5.ebuild
index c067ad5eb8ad..d7698e8e6fea 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.15.5.ebuild,v 1.1 2013/07/12 05:24:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.15.5.ebuild,v 1.3 2014/01/19 17:10:01 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19"
@@ -15,7 +15,7 @@ HOMEPAGE="http://capify.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/childprocess/childprocess-0.3.9.ebuild b/dev-ruby/childprocess/childprocess-0.3.9.ebuild
index c143ed1fdcc4..d5670f18175e 100644
--- a/dev-ruby/childprocess/childprocess-0.3.9.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.3.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.3.9.ebuild,v 1.3 2013/12/26 16:18:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.3.9.ebuild,v 1.4 2014/01/19 09:21:56 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild b/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild
index 818ed20595bd..d6e1588bad80 100644
--- a/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild
+++ b/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild,v 1.3 2014/01/14 14:00:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cmdparse/cmdparse-2.0.5-r1.ebuild,v 1.4 2014/01/19 10:32:15 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE=""
 DESCRIPTION="Advanced command line parser supporting commands"
 HOMEPAGE="http://cmdparse.rubyforge.org/"
 
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 LICENSE="LGPL-3"
 SLOT="0"
 
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
index 8bbcb3794631..8a907e8e046e 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild,v 1.3 2014/01/12 19:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild,v 1.4 2014/01/19 17:13:37 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://fast-xs.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
diff --git a/dev-ruby/gherkin/gherkin-2.11.6.ebuild b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
index 2e9d17463eeb..160eb86b2854 100644
--- a/dev-ruby/gherkin/gherkin-2.11.6.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.11.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.6 2014/01/02 07:19:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.11.6.ebuild,v 1.7 2014/01/19 09:20:33 pacho Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild
index 8d5548b84752..e09c0545c780 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild,v 1.3 2013/12/29 17:29:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.2-r1.ebuild,v 1.4 2014/01/19 10:04:33 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.12 )"
diff --git a/dev-ruby/hoe/hoe-2.13.0-r1.ebuild b/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
index 32cba595e75e..6fabe2584ec1 100644
--- a/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
+++ b/dev-ruby/hoe/hoe-2.13.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.13.0-r1.ebuild,v 1.3 2013/12/29 17:28:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.13.0-r1.ebuild,v 1.4 2014/01/19 10:04:02 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # - also requires dev-ruby/hoe-seattlerb for 1.9;
diff --git a/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild b/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild
index bdad6e0a9a21..f175931e0c48 100644
--- a/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild,v 1.7 2014/01/15 09:42:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild,v 1.8 2014/01/19 10:32:30 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rack/rack-1.4.5-r1.ebuild b/dev-ruby/rack/rack-1.4.5-r1.ebuild
index a117c079f9bf..1e51777ac64f 100644
--- a/dev-ruby/rack/rack-1.4.5-r1.ebuild
+++ b/dev-ruby/rack/rack-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.5-r1.ebuild,v 1.3 2014/01/12 19:55:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.5-r1.ebuild,v 1.5 2014/01/19 17:14:07 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
@@ -18,7 +18,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/rack/rack-1.5.2-r1.ebuild b/dev-ruby/rack/rack-1.5.2-r1.ebuild
index 1d2c7e5051ff..317b9d5bd20f 100644
--- a/dev-ruby/rack/rack-1.5.2-r1.ebuild
+++ b/dev-ruby/rack/rack-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.2-r1.ebuild,v 1.3 2014/01/12 19:55:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.2-r1.ebuild,v 1.5 2014/01/19 17:14:07 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -16,7 +16,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index d86952fd120a..02adb25890a3 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-progressbar-0.0.10.gem 13824 SHA256 2a0be5104423670956c545a200e445d5a99a02d05f6d3a1539ef53d9e4f6f0ff SHA512 d8221d1d977e98370766ada10a363bf7c05757c33388caa9abffcb1a40e16d9587055b2531639b7d1ee67cb790a8fc0bc5af0dafeefc5dfba0a8942b976b9375 WHIRLPOOL 830293fccb82068590a478d3628d1acdffcd99a806122c74ede8d7771c023a014b337d8edc2ba16a1060f57cfe540642b6961691974535e620df0c69d40a5b10
 DIST ruby-progressbar-1.0.2.gem 22528 SHA256 1c579c244ca8b9e3cdd878eae9062dd85541fe87702c051dd1954ffd5b993d77 SHA512 e323e93d1f52103079b093916af62ceeffd34715250f6fcc2623470d3327abcb2998f561e99867607e6cb5bbbc521d236c5ab348349b2ff44daf3baf6badc254 WHIRLPOOL 5418d120a766b0dc4118bc2a4ecf9649939a7810ffbdfe3574282d6c0c43fdb5338f015ea013b092a1d7f0820c69003091c686869c4cc2edd92d85412fcc4d32
+DIST ruby-progressbar-1.4.0.gem 23552 SHA256 4f66d812c7e967737b8b6207312f5338d07b58dd089db32c8eb060409fdd6709 SHA512 d5b9e6027d99b6e8971a06e094b760fa1f4f7c63b87dc529ca788535d2c62d42c9dce241437c5c32e91a5b436512660ed99f20957816fa9555accab2658bcdad WHIRLPOOL 1c01b1ba9e7360c1191e6cc9b8796dffcc2ca19749763ebc09c2854019907879499cb55d439f8e3015c78a8941d44517bf3d24f567b1476819ff2f4d0b11be12
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.0.ebuild
new file mode 100644
index 000000000000..69ab06b500f3
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.0.ebuild,v 1.1 2014/01/20 07:16:21 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild b/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild
index 31bd9cb68a37..9ea47fef92ff 100644
--- a/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild
+++ b/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild,v 1.3 2013/12/29 17:28:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r3.ebuild,v 1.4 2014/01/19 10:03:34 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://codeforpeople.rubyforge.org/rubyforge/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend '>=dev-ruby/json-1.1.7'
diff --git a/dev-ruby/spork/spork-0.9.2.ebuild b/dev-ruby/spork/spork-0.9.2.ebuild
index 1ec6f3359bb0..05a31ba25e34 100644
--- a/dev-ruby/spork/spork-0.9.2.ebuild
+++ b/dev-ruby/spork/spork-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2.ebuild,v 1.11 2013/12/26 16:17:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2.ebuild,v 1.12 2014/01/19 09:19:53 pacho Exp $
 
 EAPI=4
 
@@ -17,6 +17,6 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server."
 HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/stomp/stomp-1.2.16.ebuild b/dev-ruby/stomp/stomp-1.2.16.ebuild
index 404abde07fd0..e23fd5c42011 100644
--- a/dev-ruby/stomp/stomp-1.2.16.ebuild
+++ b/dev-ruby/stomp/stomp-1.2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.2.16.ebuild,v 1.2 2013/12/24 12:50:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.2.16.ebuild,v 1.3 2014/01/19 16:54:57 pacho Exp $
 
 EAPI=5
 
@@ -18,5 +18,5 @@ HOMEPAGE="http://rubyforge.org/projects/stomp/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
index 3c0a80b2a0d4..87be4ae18d80 100644
--- a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild,v 1.2 2013/12/22 13:54:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild,v 1.3 2014/01/19 09:54:31 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -27,7 +27,7 @@ HOMEPAGE="http://test-unit.rubyforge.org/"
 
 LICENSE="Ruby"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/tins/tins-0.13.1.ebuild b/dev-ruby/tins/tins-0.13.1.ebuild
index daf577cf284b..b6e280c30981 100644
--- a/dev-ruby/tins/tins-0.13.1.ebuild
+++ b/dev-ruby/tins/tins-0.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tins/tins-0.13.1.ebuild,v 1.2 2013/12/22 13:54:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tins/tins-0.13.1.ebuild,v 1.3 2014/01/19 09:54:58 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 ) "
diff --git a/dev-ruby/unf/unf-0.1.3-r1.ebuild b/dev-ruby/unf/unf-0.1.3-r1.ebuild
index d955cec96160..842c3d87e831 100644
--- a/dev-ruby/unf/unf-0.1.3-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/unf-0.1.3-r1.ebuild,v 1.1 2013/11/11 13:19:01 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/unf-0.1.3-r1.ebuild,v 1.2 2014/01/19 17:00:50 pacho Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 # jruby already has support for UNF so it does not need the extension.
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild
index 7d3432754146..7f08c6924001 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild,v 1.1 2013/11/11 10:24:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf_ext/unf_ext-0.0.6-r1.ebuild,v 1.2 2014/01/19 17:01:11 pacho Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://sourceforge.jp/projects/unf/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild
deleted file mode 100644
index a20f861315f4..000000000000
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild,v 1.6 2013/04/27 06:50:43 patrick Exp $
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Readline extension to TCL"
-HOMEPAGE="http://tclreadline.sf.net/"
-SRC_URI="mirror://sourceforge/tclreadline/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/tcl
-	sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gold.patch )
-
-src_prepare() {
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		--with-tcl-includes="${EPREFIX}/usr/include"
-		--with-readline-includes="${EPREFIX}/usr/include"
-		--with-readline-library="${EPREFIX}/usr/$(get_libdir)"
-		)
-	autotools-utils_src_configure
-}
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r3.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r3.ebuild
deleted file mode 100644
index f726540eac93..000000000000
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0-r3.ebuild,v 1.1 2013/11/17 09:31:58 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib toolchain-funcs
-
-DESCRIPTION="Readline extension to TCL"
-HOMEPAGE="http://tclreadline.sf.net/"
-SRC_URI="mirror://sourceforge/tclreadline/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/tcl
-	sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gold.patch )
-
-src_prepare() {
-	sed \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-i configure.in || die
-	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		--with-tcl-includes="${EPREFIX}/usr/include"
-		--with-readline-includes="${EPREFIX}/usr/include"
-		--with-readline-library="${EPREFIX}/usr/$(get_libdir)"
-		--with-tlib-library="$($(tc-getPKG_CONFIG) --libs ncurses)"
-		)
-	autotools-utils_src_configure
-}
diff --git a/dev-util/aruba/aruba-0.5.3.ebuild b/dev-util/aruba/aruba-0.5.3.ebuild
index 5b9a62726ff7..b1a009089b77 100644
--- a/dev-util/aruba/aruba-0.5.3.ebuild
+++ b/dev-util/aruba/aruba-0.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.5.3.ebuild,v 1.3 2013/12/26 18:59:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.5.3.ebuild,v 1.4 2014/01/19 09:23:17 pacho Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19"
@@ -17,7 +17,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications."
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild
index f30cbb7ec2fc..c77f0b6bb2aa 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild,v 1.1 2013/12/22 08:56:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.8-r1.ebuild,v 1.2 2014/01/20 01:32:36 jer Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools
diff --git a/dev-util/buildbot/buildbot-0.8.8-r2.ebuild b/dev-util/buildbot/buildbot-0.8.8-r2.ebuild
index e3341166f24d..7fbc74f3fc27 100644
--- a/dev-util/buildbot/buildbot-0.8.8-r2.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r2.ebuild,v 1.2 2013/12/10 19:04:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r2.ebuild,v 1.3 2014/01/20 01:32:50 jer Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples irc mail manhole test"
 
 # sqlite3 module of Python 2.5 is not supported.
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
index d1e1aff93f2c..fc248b7042fe 100644
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.2-r1.ebuild,v 1.4 2013/12/12 05:55:30 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.2-r1.ebuild,v 1.6 2014/01/19 10:44:18 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz http://dev.g
 
 LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/ccache/ccache-3.1.9-r3.ebuild b/dev-util/ccache/ccache-3.1.9-r3.ebuild
index 9b4a53d28725..911ec104b032 100644
--- a/dev-util/ccache/ccache-3.1.9-r3.ebuild
+++ b/dev-util/ccache/ccache-3.1.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9-r3.ebuild,v 1.10 2014/01/18 20:10:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9-r3.ebuild,v 1.11 2014/01/19 10:21:16 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-util/cucumber/cucumber-1.2.1.ebuild b/dev-util/cucumber/cucumber-1.2.1.ebuild
index efc4910db7b6..c4d54e818266 100644
--- a/dev-util/cucumber/cucumber-1.2.1.ebuild
+++ b/dev-util/cucumber/cucumber-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.2.1.ebuild,v 1.5 2014/01/02 07:21:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.2.1.ebuild,v 1.6 2014/01/19 09:21:15 pacho Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18"
@@ -18,7 +18,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="examples"
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index aa494ff784c3..eca276624ca9 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,5 +1,3 @@
-DIST debootstrap_1.0.52.tar.gz 57505 SHA256 0b7ad9c887de826a4561ff552069a8663b38e2cf4c91182a37682d737bff39f9 SHA512 fe0b3f30c8093d303d768d411475ec01936a02e4e52d863695ffe06daf7de962a2703cb4536e45e9fe8d33020239e95f388554be6385a4dcdead25cd0fe803f6 WHIRLPOOL 437be4c7c687ec236bf494c634cf9a0ba5f29052aab1ce49ecca4972d6db022931efa9556224400b2a56e664eb9b8408405a2a2dc8fbb3466cee90bf004b9bf4
-DIST debootstrap_1.0.53.tar.gz 59064 SHA256 26b74baee6909e9ce363891cc355fced6d875ca8c3715e72ff9dfb580c9cc272 SHA512 3a4e4c0a2362646af080ce63db82ef418b2306ab1f39253dbf14667b68b9970da0c14398218574aff62a31f5f369e23e1483a1b4e44d7fc06ebb497643a74663 WHIRLPOOL ae87558aa7dc2eb985ef57b8680ff55e38528ad50ad74ecb20e3b4d49bdb20db673854a413b1ca1239014a9fcf85256ef150976ff37c10c618d43df2cea4d17e
 DIST debootstrap_1.0.55.tar.gz 59024 SHA256 a0c4f8980df376470ab71687c43a41fe62a44b117c58a4b8d98a6177cfd5e33a SHA512 5d1672ee24bf8375987b8c54a093f24fb879d8b3c9f11d377097d90001d18e9d1acd155552eeb22b8f4d6361ba6b86bbc833822f27f12222f12bd4b757e1a786 WHIRLPOOL c81e2e5bb8130083887d738557e034a31553c7beea521dafd2f27ed31233effc60524e005266539fbf4043049a1dff55214ec7346366df265bbc81cd50c73aff
 DIST debootstrap_1.0.56.tar.gz 59501 SHA256 14b40be6cc807a2013ed05105325638bd56643cd289dfa91321d9d1d7a393e7b SHA512 831bd97cd8fe5338315d812c683055f3879ca55c653d565886faf3d17f2fc9462beecd05e923ea8a9ae713c0398e59c6a4affd9b557cf181c04bc2034641fbac WHIRLPOOL ab5eef9656fe24b335ed75ac99bcc4e45314b9ae9e440efb47f8114f7af3ec1ec114bd112871f801dc1553274b71015c9990bfb390b96e9d3ba86ec600e95068
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.52.ebuild b/dev-util/debootstrap/debootstrap-1.0.52.ebuild
deleted file mode 100644
index f75756df1885..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.52.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.52.ebuild,v 1.11 2013/07/02 07:41:49 ago Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.53.ebuild b/dev-util/debootstrap/debootstrap-1.0.53.ebuild
deleted file mode 100644
index 56893cb027fc..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.53.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.53.ebuild,v 1.1 2013/07/18 11:52:11 jer Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
-	fi
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
index 2c0f90249a63..7cb4cf7f1946 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild,v 1.8 2014/01/18 20:00:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild,v 1.9 2014/01/19 10:15:21 ago Exp $
 
 EAPI=5
 inherit elisp-common eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 36dd40441dd9..077c91cb3078 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,3 +1,4 @@
 DIST dialog-1.2-20121230.tgz 431584 SHA256 1fb4ea11ceba8f105c2c6b48186bf715d98a144a738653627d7bf2bd12e21034 SHA512 1cb22390125649dde3a11e7ba6725d2ee5ff3a44500f10c7731817d2a3de60b853e9f471c8ebc96e8b36b0044b1a49255cbe98cd2216b0efee0ebfbd7f194ca2 WHIRLPOOL dcd9a986b6f3341f2ac155bbe063116580ff82c06f8fa31f525e9fd401a052729890c9a04c9701b7a77612fe5200f8369a0879cc88df7dc15339c02284c8a4d1
 DIST dialog-1.2-20130523.tgz 432886 SHA256 c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d SHA512 9388828aa452d245063b17751b800aa257edf1420a12463f6fc28cf4c2758a01ddfd9ae214662eeb7b9d6a2066fab33189d2d168d82fe497dfaf20288797bf6e WHIRLPOOL 2037e6d1d4d523671806d1b73dce1bb3082c991e9f07e8f39535f0cf4437087bd77ecf12bd2b707c789570fab0dd75904baab4e36207da88005ebd1d79645230
 DIST dialog-1.2-20130928.tgz 451567 SHA256 6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c SHA512 c3666c6b1d63513b405ef7bea98a5fd3ba947e7d281bd260b3cf38aff1be93a2c29a350d753f2339478937530ad1b134b323c557f8803d7761941c3116893c90 WHIRLPOOL 0967fde4e190366a847e937e78431104971a42688990fb3117d95ae9feca964747d0e969d40b56ecd0094525d165f57c37c8ddd5821b7162e6aa2a12c0c206f5
+DIST dialog-1.2-20140112.tgz 452560 SHA256 8d30043872c57d4d3b3b05e4390ece356843f2a71303c91a2f8a536b369e0077 SHA512 3d43ddf24daf06545b7ccffb2dc6452a2d38752886ce2425d7f3bffcc223d2c9317c05959c63f22e1b55efb63854247ccef8eaf964a1e1643c84f5c31deefc50 WHIRLPOOL d3a41f5a40efccc69410271b644c1eb14d01f7439c7999761dd8489ecc1ac38c9ad60be08dfd5b8af3c76f70143963f62a0288a3e85709ccfbca0d4b67b9c8ec
diff --git a/dev-util/dialog/dialog-1.2.20140112.ebuild b/dev-util/dialog/dialog-1.2.20140112.ebuild
new file mode 100644
index 000000000000..6e97d530b73c
--- /dev/null
+++ b/dev-util/dialog/dialog-1.2.20140112.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.2.20140112.ebuild,v 1.1 2014/01/19 17:42:45 jer Exp $
+
+EAPI="4"
+
+inherit eutils multilib versionator
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+S=${WORKDIR}/${PN}-${MY_PV}
+DESCRIPTION="tool to display dialog boxes from a shell"
+HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
+SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="examples minimal nls static-libs unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2-r5
+	unicode? ( sys-libs/ncurses[unicode] )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!minimal? ( sys-devel/libtool )
+	!<=sys-freebsd/freebsd-contrib-8.9999
+"
+
+src_prepare() {
+	sed -i configure -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-rpath-hack \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts=$(usex static-libs '' '-shared') \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	if use minimal; then
+		default
+	else
+		emake DESTDIR="${D}" install-full
+	fi
+
+	dodoc CHANGES README
+
+	use examples && dodoc -r samples
+
+	use static-libs || prune_libtool_files
+}
diff --git a/dev-util/diffstat/diffstat-1.58.ebuild b/dev-util/diffstat/diffstat-1.58.ebuild
index dd44fc18eeba..003898df5fde 100644
--- a/dev-util/diffstat/diffstat-1.58.ebuild
+++ b/dev-util/diffstat/diffstat-1.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.58.ebuild,v 1.10 2014/01/18 05:29:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.58.ebuild,v 1.11 2014/01/19 10:21:29 ago Exp $
 
 EAPI="5"
 
@@ -10,4 +10,4 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/geany-plugins/geany-plugins-1.23.ebuild b/dev-util/geany-plugins/geany-plugins-1.23.ebuild
index f3529fb0af0d..44191a969955 100644
--- a/dev-util/geany-plugins/geany-plugins-1.23.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.23.ebuild,v 1.8 2013/11/24 19:00:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.23.ebuild,v 1.9 2014/01/19 20:05:59 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="+commander debugger devhelp enchant gpg gtkspell lua markdown multiterm nls scope soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 76589cb6da9f..f86e7532c287 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,3 +1,3 @@
-DIST global-6.2.10.tar.gz 793 SHA256 951423d2eedf67d8c58f6e8860de3cd7239dc27c49bf68634150f83a50a87d38 SHA512 e594c7fd24c8f8e5753513d1d86b21ff2c7c1b4fd0ded5b1529b27fb797ecd5eaa02932ecf2beb486107b74208a73f801f20cb7696ee9718e1c7e49c1b038188 WHIRLPOOL aa0b6fa24e39775228c9eb86476c7dda65cd3271b45cc5d5db48f01c23e82ee39537ceb4de8338908a4926eafd4a797854daeb04c89a04ef8b7c0f598998190f
+DIST global-6.2.10.tar.gz 1366667 SHA256 eeacb28690e3d39ca8deec2961fc75f684e251ced627a51d89448f951efadb96 SHA512 dd1e94bbda92d78ad3dff940ed676967257ac01e171c4223e664a6d73e710de0c0b5bdd43424e03e68a821e0bc48c552f118d6f6704d0e45fc493315f3e13776 WHIRLPOOL 0b2e22dedd5515120da33efc8bd6f6180cd7fdfee5c0f5425c621dcd0d82980c7d129d1f2867abe5bd3bae869620bf9640f74f562a9558c01eac32fb086abc93
 DIST global-6.2.8.tar.gz 1313627 SHA256 c1ed3b2500e00d3fb5dbf23d7e7e6b4feb1af45c12015ef9030114e76628cfd0 SHA512 c84401dd2d492db9eefbf80957db07e5d8e1ce5e174950cda58a0ad6873a9e504fd745ea63ba7f0f688f8eb5f9aa86c4839aec62ec3c7f420168d73b5d47e44f WHIRLPOOL 34e19dff43fa365fb56600a0df9b8f7a22f09f387d2ae72fbf9a3ceb749d0a21c8dd90fdb2fa542b5c4566f1676a3a121693d3352722fefcb6aa3d8d1661f45f
 DIST global-6.2.9.tar.gz 1314940 SHA256 d8d831cbd9bac9f51598af316231290cc328e4f18dc29b58a2f2ae0fee44c303 SHA512 3d23b7c6f0066cb5d6c88f138fd8403d7155c677ea8b6f3bef40c1ff81e7d3246dcd127a2b5c91df7c935b4f53b0ba0e39618a3a1136291724f150710e172488 WHIRLPOOL 4018a43365e9a41601c981c86a73a34cb473fc7eef73303a56ea72ebbc2cb483f4f3d3b82dfc2b79e3e8922d6baef618e70edd01f326e8123f5810e5de4f8285
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
index d3a729d4e2f2..46dbae4d6365 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild,v 1.1 2013/10/31 17:36:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild,v 1.2 2014/01/19 16:36:17 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
 if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
index 16a3408743ad..38edd6c292fb 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild,v 1.1 2013/10/31 17:45:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild,v 1.2 2014/01/19 16:36:01 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE="debug doc"
 SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
 
 if [[ $PV != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	KEYWORDS=""
 fi
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
index f77c527d8d18..2e0e2c6deabb 100644
--- a/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild,v 1.1 2013/10/30 16:03:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild,v 1.2 2014/01/19 16:36:33 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ MY_P="${MY_PN}-${MY_PV}"
 
 if [[ $PV != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 else
 	EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
diff --git a/dev-util/kdevelop/kdevelop-4.5.2.ebuild b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
index cc8799842fcd..36413dbe1f3e 100644
--- a/dev-util/kdevelop/kdevelop-4.5.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild,v 1.2 2013/11/04 14:30:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild,v 1.3 2014/01/19 16:35:21 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
 if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 fi
 
 DEPEND="
diff --git a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
index f53b9dd1003b..dc41de27be46 100644
--- a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild,v 1.1 2013/10/31 17:20:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild,v 1.2 2014/01/19 16:35:44 pacho Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 fi
 
 DEPEND="
diff --git a/dev-util/mono-tools/mono-tools-2.10.ebuild b/dev-util/mono-tools/mono-tools-2.10.ebuild
index 65c2ef3048f6..063d5e327203 100644
--- a/dev-util/mono-tools/mono-tools-2.10.ebuild
+++ b/dev-util/mono-tools/mono-tools-2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.10.ebuild,v 1.7 2012/05/04 17:51:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.10.ebuild,v 1.8 2014/01/19 21:21:02 moult Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="+webkit gtkhtml"
 
-RDEPEND="=virtual/monodoc-${GO_MONO_REL_PV}*
+RDEPEND="=dev-lang/mono-${GO_MONO_REL_PV}*
 	>=dev-dotnet/gtk-sharp-2.12.6:2
 	>=dev-dotnet/glade-sharp-2.12.6:2
 	>=dev-dotnet/gconf-sharp-2:2
diff --git a/dev-util/plasmate/plasmate-1.0.ebuild b/dev-util/plasmate/plasmate-1.0.ebuild
index 942fc1a7fa6e..0a639e8c414e 100644
--- a/dev-util/plasmate/plasmate-1.0.ebuild
+++ b/dev-util/plasmate/plasmate-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plasmate/plasmate-1.0.ebuild,v 1.1 2013/06/21 13:50:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plasmate/plasmate-1.0.ebuild,v 1.2 2014/01/20 10:22:04 kensington Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE="debug"
 
 DEPEND="
 	app-crypt/gpgme
-	dev-libs/libattica
+	dev-libs/libattica[qt4]
 	dev-libs/soprano
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep knewstuff)
diff --git a/dev-util/xdelta/xdelta-3.0.6.ebuild b/dev-util/xdelta/xdelta-3.0.6.ebuild
index c698693d6a1e..c4237c487aa0 100644
--- a/dev-util/xdelta/xdelta-3.0.6.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.6.ebuild,v 1.7 2014/01/18 20:10:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.6.ebuild,v 1.8 2014/01/19 10:21:42 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="examples test"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/dev-vcs/cvs/cvs-1.11.23.ebuild b/dev-vcs/cvs/cvs-1.11.23.ebuild
index 985f57601c38..fda4c30fc119 100644
--- a/dev-vcs/cvs/cvs-1.11.23.ebuild
+++ b/dev-vcs/cvs/cvs-1.11.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.23.ebuild,v 1.2 2011/02/10 18:09:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.11.23.ebuild,v 1.3 2014/01/19 10:21:13 vapier Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/stable/${PV}/${P}.tar.bz2
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~arm64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs"
 
 DEPEND=">=sys-libs/zlib-1.1.4"
diff --git a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
index 953ef39e90fb..dd75326c888d 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.2 2013/02/18 04:41:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r10.ebuild,v 1.4 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -44,6 +44,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
index 2f3c9dbd4b79..c3f1ba4f2cbb 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.2 2012/06/09 07:10:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.4 2014/01/19 10:30:16 vapier Exp $
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -36,6 +36,11 @@ src_unpack() {
 }
 
 src_compile() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
index 1e9e3a1cc375..82595956864d 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r7.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r7.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -40,6 +40,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
index 2cb328f11ebb..437120876804 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r8.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r8.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -41,6 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
index da9ed0bf9def..c1a920da3af0 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r9.ebuild,v 1.3 2012/06/09 07:10:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r9.ebuild,v 1.5 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -43,6 +43,11 @@ src_prepare() {
 }
 
 src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
index b3053e5f9970..86f97e292177 100644
--- a/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r1.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r1.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc emacs kerberos nls pam server"
 
@@ -50,6 +50,11 @@ src_configure() {
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
 	fi
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
index c16c9ba44f85..54820a012219 100644
--- a/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r2.ebuild,v 1.1 2013/01/11 13:47:04 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13-r2.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam
+inherit eutils pam toolchain-funcs
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc emacs kerberos nls pam server"
 
@@ -51,6 +51,11 @@ src_configure() {
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
 	fi
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
index 926db59b5f50..937bf67cce16 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild,v 1.2 2013/04/04 13:43:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r1.ebuild,v 1.4 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam versionator
+inherit eutils pam toolchain-funcs versionator
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -69,6 +69,11 @@ src_configure() {
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
 	fi
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
index ea1e027fd3a5..1dbf7262c5cb 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild,v 1.1 2013/04/24 09:58:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1-r2.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam versionator
+inherit eutils pam toolchain-funcs versionator
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -70,6 +70,11 @@ src_configure() {
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
 	fi
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.ebuild b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
index b586c29db1d5..f5b7e37bdb8d 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.13.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1.ebuild,v 1.1 2010/06/19 00:27:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.13.1.ebuild,v 1.3 2014/01/19 10:30:16 vapier Exp $
 
 EAPI=3
 
-inherit eutils pam versionator
+inherit eutils pam toolchain-funcs versionator
 
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.nongnu.org/cvs/"
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -66,6 +66,11 @@ src_configure() {
 		ewarn "The server and proxy code are enabled as they are required for tests."
 		myconf="--enable-server --enable-proxy"
 	fi
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
 	econf \
 		--with-external-zlib \
 		--with-tmpdir=/tmp \
diff --git a/dev-vcs/git-cola/git-cola-1.9.1.ebuild b/dev-vcs/git-cola/git-cola-1.9.1.ebuild
index 3f36e758109b..b6a42c0f8436 100644
--- a/dev-vcs/git-cola/git-cola-1.9.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-1.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.1.ebuild,v 1.1 2013/11/07 16:56:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.1.ebuild,v 1.2 2014/01/19 19:04:32 jlec Exp $
 
 EAPI=5
 
@@ -26,15 +26,23 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	app-text/xmlto
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	sys-devel/gettext
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-disable-tests.patch
 	"${FILESDIR}"/${P}-system-ssh-askpass.patch
 	)
 
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
 python_prepare_all() {
 	rm share/git-cola/bin/*askpass* || die
 
diff --git a/dev-vcs/git-cola/git-cola-1.9.3.ebuild b/dev-vcs/git-cola/git-cola-1.9.3.ebuild
index fca042ad2977..c707607c28b6 100644
--- a/dev-vcs/git-cola/git-cola-1.9.3.ebuild
+++ b/dev-vcs/git-cola/git-cola-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.3.ebuild,v 1.1 2014/01/15 12:00:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.9.3.ebuild,v 1.2 2014/01/19 19:04:32 jlec Exp $
 
 EAPI=5
 
@@ -28,13 +28,22 @@ DEPEND="${RDEPEND}
 	app-text/xmlto
 	sys-devel/gettext
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-tests.patch
 	"${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
 	)
 
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
+
 python_prepare_all() {
 	rm share/git-cola/bin/*askpass* || die
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 24a130d2941b..7a6f8629abb9 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1 +1,2 @@
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 SHA256 65c4646b5609f987b3004dbc44ebf9a76d3f1791414fbe13eacea25460b966ae SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e WHIRLPOOL 9d4effd46f5953bb330f799962a79fb999ada0c6ba8cf0b536275f3c56f1178f76730b6ab659e8adf3378c2fbe8ba6ff602eec15e32822192cd0d07f8637aa8d
+DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 SHA256 0a7025e597f9e50b15bf181c34e7851b68e449400ebfbcc96be7d307760cb726 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb WHIRLPOOL 0cb2b06a13f6a57e335556c68861bb1cf7ea907901cf3cb9479757775b1e8636856b889f12cecb5dff10200afbd66ad810e450a81739f6ce7b399e6fe6685afe
diff --git a/dev-vcs/gitolite/gitolite-3.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
similarity index 55%
rename from dev-vcs/gitolite/gitolite-3.2.ebuild
rename to dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
index aa4c88d7ac23..034e7658fd5c 100644
--- a/dev-vcs/gitolite/gitolite-3.2.ebuild
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.2.ebuild,v 1.2 2013/04/05 06:17:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild,v 1.2 2014/01/19 17:48:59 idl0r Exp $
 
 EAPI=5
 
 inherit perl-module user versionator
 
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +20,8 @@ DEPEND="dev-lang/perl
 	virtual/perl-File-Temp
 	>=dev-vcs/git-1.6.6"
 RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
 	vim-syntax? ( app-vim/gitolite-syntax )"
 
 pkg_setup() {
@@ -29,7 +30,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	echo $PF > src/VERSION
+	echo "${PF}-gentoo" > src/VERSION
 }
 
 src_install() {
@@ -70,13 +71,21 @@ src_install() {
 pkg_postinst() {
 	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
 		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
 		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
 	fi
 
 	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
 }
diff --git a/dev-vcs/gitolite-gentoo/metadata.xml b/dev-vcs/gitolite-gentoo/metadata.xml
index da7fd885a532..7e8ef57c8013 100644
--- a/dev-vcs/gitolite-gentoo/metadata.xml
+++ b/dev-vcs/gitolite-gentoo/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="contrib">Install user-contributed files</flag>
+		<flag name="tools">Install tools to e.g. convert a Gitosis config to
+			gitolite or one to check if your setup is gitolite >= 3.x compatible</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index dffa3d051d3e..966e3cbe7de6 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,9 +1,2 @@
 DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
-DIST gitolite-3.1.tar.gz 119322 SHA256 36fc270c29e980f7217c203656373d1c44f73035fe18053163301cd10a4e0f04 SHA512 4b6a5a7fc558f4428350af7960e9f8ef923c114c2772c523d44c968a8c7d78dd52f2ae906f70d0f86fb1eab2c09f70a32df42c7cc24c002bec96dd654b904ec4 WHIRLPOOL 477f69bfcd2d5eff45f336fe569fd2b73c4349dd45d124cb0841a849b9f68b732afb3d1ddb497bf980bb3fd902b872b9c1018f09325a77e9eb1a16d0d4a94c3d
-DIST gitolite-3.2.tar.gz 120939 SHA256 62d56e3910b52d0ecb53d5962d4c919ede2c6c11283c3c845605bfc643e64ab8 SHA512 0e514e0c534aae59c1d03bd0849fe8c5c49995213bbd3d8eb7648730a14216fb910a4e295b9d46b959f55948a653a59700888b1b6c7909ff7ca01427d31f45e7 WHIRLPOOL efcdb05ae045e54fc0314ff77db93fed9eb5204ae6d755e82676a05dbf10055a38d617432298222b142dd0a2236fef4b9e8e2928482b77229a457e5b8a18ac36
-DIST gitolite-3.3.tar.gz 123163 SHA256 fae3755bcd9bf78bdf68167b5d4f01e28e0a25359417fb6c030c35998a94edd3 SHA512 899a5b48bf32952edf9e231daf02f65526c11e3dbf412ede22e6c8a0359c6c4858716e98c470faeaee23ad5a8c2125bea8c7b4b46cb33123f6a559a26a359d85 WHIRLPOOL 33baccd0d24a4d7f71a1b87f6ab5239968e4c4ebd2eaaeda230a298bf471277e568d529c9944973f40d0498fe57fde199dea81c36ae80971c5ad330ba8f7b170
-DIST gitolite-3.4.tar.gz 127700 SHA256 4139439c1439fc5d03a478d3d1cd0e0c0239b145b96d6795a116bfb2adefe9a4 SHA512 f8bd1c75052856bb65ea0259d3776f831bbf2c274e52496ee27272d4303efeaa1a58f50ffe4efc24286b843e38aa84bce7bcd7149157f8ffeee6d611b066ad7b WHIRLPOOL 4140ff2f09cc2959cea2f63141dc2541ee8f12f08a49fa3905d8bcef7068f9affca114a1e2737186b7e362bb2c11a9d479b7472937b87780ae196b0d52bc7eb8
-DIST gitolite-3.5.1.tar.gz 128671 SHA256 077d4da562d1b3319bd21916461c80dff32b4e871eac8073ff4f19315da64ef7 SHA512 b5967fa1fd864fc93049e09cb4a257b561f8f7cea7bf5a84da724aaae2ceb9843f350cf6800ef4d97c201a75d0a6d70d939d4df09aa46551772db74d889278f4 WHIRLPOOL e783627b94b38b5d223ded4eb26401ba622c0cd68aeaad2ae7802fe9d701cf04546ec3f0ea7360b07af5b5232b5ef7f39e885a89ba0fc3823c389b69e50df6e5
-DIST gitolite-3.5.2.tar.gz 131361 SHA256 cc689eea2bca200ea3627f4bb4688b5b6cece330055ab347ea664e1d84045f79 SHA512 0ff55893b9ea6ad990b1b54ed38f53f1f537074f98222d2a24141e850828c66dd58b8973e442e8ecd4e4a2ba097b84a3f07aeb90c0b3243a1ca13b790d6c2b97 WHIRLPOOL 6e860aa6f1e5854322b123b9cc54fd26b9f19d9ce82e674d4b93f17aef6414c00102290934add78152692fbd964bb925d9d1925141d8d3b9a01868d73012d03d
 DIST gitolite-3.5.3.1.tar.gz 148133 SHA256 688b7f0f93792ae87c6c15d9ba9ba2a16c05a3df4813359e13a40f9ebe35ac58 SHA512 4a40b82f63886430fbd87fe9ba9f3cd70102909b41e1344215d78ed7e698cf5f094658c7bb0e1f07542cee94c88f703766535d749e348c022f39b4516cd0009e WHIRLPOOL e03965eaa6677f1391ad92bedf630929ce155b708981857b539ee8b8264b450cdd730186ac010fdc0fba594a29128cd4322340b41a9212803455729b62bbde17
-DIST gitolite-3.5.tar.gz 128647 SHA256 049217579bdb123c7dedb23afbd06b47bfddc76d54415c246a0c5a049401e1e1 SHA512 e84ddbc1a0282a76f1e50cef5cfccd10c20432c4a9919faebe64f2052bed4c3f210018a9938df7304f473622fb7478e685547eda974546afec7b68a7523fe635 WHIRLPOOL dfd076815fd3433b779969e5abbc6d43dbfcbf1819960f7740b5995502d3b00f52156874d36dd630c271a8af5fbf6ad40b816b5190b68108dff871a95890cfdb
diff --git a/dev-vcs/gitolite/gitolite-3.1.ebuild b/dev-vcs/gitolite/gitolite-3.1.ebuild
deleted file mode 100644
index 5b18ab2c22af..000000000000
--- a/dev-vcs/gitolite/gitolite-3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.1.ebuild,v 1.2 2013/04/05 06:17:31 radhermit Exp $
-
-EAPI=4
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="http://milki.github.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.3.ebuild b/dev-vcs/gitolite/gitolite-3.3.ebuild
deleted file mode 100644
index 363214e3d52f..000000000000
--- a/dev-vcs/gitolite/gitolite-3.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.3.ebuild,v 1.2 2013/04/05 06:17:31 radhermit Exp $
-
-EAPI=5
-
-inherit perl-module user versionator vcs-snapshot
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.4.ebuild b/dev-vcs/gitolite/gitolite-3.4.ebuild
deleted file mode 100644
index e100f3316f9c..000000000000
--- a/dev-vcs/gitolite/gitolite-3.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.4.ebuild,v 1.2 2013/04/05 06:17:31 radhermit Exp $
-
-EAPI=5
-
-inherit perl-module user versionator vcs-snapshot
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.5.1.ebuild b/dev-vcs/gitolite/gitolite-3.5.1.ebuild
deleted file mode 100644
index e504197c1330..000000000000
--- a/dev-vcs/gitolite/gitolite-3.5.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.1.ebuild,v 1.1 2013/04/13 07:41:24 radhermit Exp $
-
-EAPI=5
-
-inherit perl-module user versionator vcs-snapshot
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.5.2.ebuild b/dev-vcs/gitolite/gitolite-3.5.2.ebuild
deleted file mode 100644
index 5c894190d274..000000000000
--- a/dev-vcs/gitolite/gitolite-3.5.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.2.ebuild,v 1.1 2013/07/10 23:49:02 radhermit Exp $
-
-EAPI=5
-
-inherit perl-module user versionator vcs-snapshot
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
index a2edbdcf0a08..d1ba46b74417 100644
--- a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild,v 1.3 2013/12/31 10:31:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild,v 1.4 2014/01/19 16:48:26 idl0r Exp $
 
 EAPI=5
 
@@ -70,7 +70,7 @@ src_install() {
 pkg_postinst() {
 	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
 		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
 		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
 	fi
 
diff --git a/dev-vcs/gitolite/gitolite-3.5.ebuild b/dev-vcs/gitolite/gitolite-3.5.ebuild
deleted file mode 100644
index 9329438e1245..000000000000
--- a/dev-vcs/gitolite/gitolite-3.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.ebuild,v 1.2 2013/04/05 06:17:31 radhermit Exp $
-
-EAPI=5
-
-inherit perl-module user versionator vcs-snapshot
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="http://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index 3a9d3956fa19..ec6072d54853 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.37 2013/05/11 12:46:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.38 2014/01/19 08:23:36 slyfox Exp $
 
 # @ECLASS: ghc-package.eclass
 # @MAINTAINER:
@@ -111,11 +111,18 @@ ghc-supports-smp() {
 
 # @FUNCTION: ghc-supports-dynamic-by-default
 # @DESCRIPTION:
-# checks if ghc link against shared haskell libraries by default
+# checks if ghc links against shared haskell libraries by default
 ghc-supports-dynamic-by-default() {
 	$(ghc-getghc) --info | grep "Dynamic by default" | grep -q "YES"
 }
 
+# @FUNCTION: ghc-supports-interpreter
+# @DESCRIPTION:
+# checks if ghc has interpreter mode (aka GHCi)
+# It usually means that ghc supports for template haskell.
+ghc-supports-interpreter() {
+	$(ghc-getghc) --info | grep "Have interpreter" | grep -q "YES"
+}
 
 # @FUNCTION: ghc-extractportageversion
 # @DESCRIPTION:
diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass
index 84cd04c69a56..da8adf04539a 100644
--- a/eclass/gtk-sharp-module.eclass
+++ b/eclass/gtk-sharp-module.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.36 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.37 2014/01/19 21:13:08 moult Exp $
 
 # @ECLASS: gtk-sharp-module.eclass
 # @MAINTAINER:
@@ -137,7 +137,7 @@ esac
 case ${PF} in
 	#gtk-sharp tarball
 	gtk-sharp-docs*)
-		add_depend ">=virtual/monodoc-2.0"
+		add_depend ">=dev-lang/mono-2.0"
 		;;
 	gtk-sharp-gapi*)
 		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
diff --git a/gnome-base/gnome-light/gnome-light-3.6.2.ebuild b/gnome-base/gnome-light/gnome-light-3.6.2.ebuild
deleted file mode 100644
index df33c9221c8f..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.6.2.ebuild,v 1.2 2013/05/17 02:55:23 mattst88 Exp $
-
-EAPI="5"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +fallback +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.6.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	fallback? ( >=gnome-base/gnome-fallback-${PV} )
-
-	>=x11-themes/gnome-icon-theme-3.6.2
-	>=x11-themes/gnome-icon-theme-symbolic-3.6.2
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	>=x11-terms/gnome-terminal-3.6.1
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.14.2"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use fallback && ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell nor GNOME Fallback!"
-		ewarn "You will have to install and manage a window manager by yourself"
-		# https://bugs.gentoo.org/show_bug.cgi?id=303375
-		ewarn "See: <add link to docs about component handling in gnome-session>"
-	fi
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.8.0.ebuild b/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
index 068076b5b367..dcfaf143438f 100644
--- a/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.8.0.ebuild,v 1.3 2013/12/08 18:31:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.8.0.ebuild,v 1.4 2014/01/19 19:50:59 pacho Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
index 82398e195cea..917c1a91fe39 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.xml
@@ -5,8 +5,6 @@
 <use>
 	<flag name="automount">Use <pkg>gnome-base/gvfs[gdu]</pkg> for automounting
 		of drives in nautilus</flag>
-	<flag name="fallback">Install <pkg>gnome-base/gnome-panel</pkg> and
-		<pkg>x11-wm/metacity</pkg> for the GNOME 3 fallback mode</flag>
 	<flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
 		<pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag>
 </use>
diff --git a/gnome-base/gnome/gnome-3.8.0-r1.ebuild b/gnome-base/gnome/gnome-3.8.0-r1.ebuild
index 69b8b7f2b7bb..aaa7012ebac0 100644
--- a/gnome-base/gnome/gnome-3.8.0-r1.ebuild
+++ b/gnome-base/gnome/gnome-3.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.8.0-r1.ebuild,v 1.4 2013/12/08 18:35:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.8.0-r1.ebuild,v 1.5 2014/01/19 19:59:41 pacho Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="accessibility +bluetooth +classic +cdr cups +extras flashback"
 
diff --git a/gnome-extra/synapse/synapse-0.2.10.ebuild b/gnome-extra/synapse/synapse-0.2.10.ebuild
index 1f9431574201..0f5f8ee792b0 100644
--- a/gnome-extra/synapse/synapse-0.2.10.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.10.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.10.ebuild,v 1.8 2013/05/05 12:59:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.10.ebuild,v 1.9 2014/01/19 15:20:08 jlec Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=true
 VALA_MIN_API_VERSION=0.14
+VALA_MAX_API_VERSION=0.20
 
 inherit gnome2 autotools-utils gnome2-utils vala
 
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild
index e558ecda73f2..a620555a3b2c 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild,v 1.1 2014/01/10 04:21:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.11.5.ebuild,v 1.2 2014/01/20 08:00:12 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/akregator/akregator-4.11.5.ebuild b/kde-base/akregator/akregator-4.11.5.ebuild
index b5a304b06b85..18b9e45c159f 100644
--- a/kde-base/akregator/akregator-4.11.5.ebuild
+++ b/kde-base/akregator/akregator-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE news feed aggregator."
 HOMEPAGE="http://www.kde.org/applications/internet/akregator"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/amor/amor-4.11.5.ebuild b/kde-base/amor/amor-4.11.5.ebuild
index 6b53d3dcc0c5..b69e5600a5b1 100644
--- a/kde-base/amor/amor-4.11.5.ebuild
+++ b/kde-base/amor/amor-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.11.5.ebuild,v 1.2 2014/01/20 08:00:08 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="x11-libs/libX11
diff --git a/kde-base/analitza/analitza-4.11.5.ebuild b/kde-base/analitza/analitza-4.11.5.ebuild
index 54c968499e0e..db5cc863b723 100644
--- a/kde-base/analitza/analitza-4.11.5.ebuild
+++ b/kde-base/analitza/analitza-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.11.5.ebuild,v 1.2 2014/01/20 08:00:28 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug readline"
 
 DEPEND="
diff --git a/kde-base/ark/ark-4.11.5.ebuild b/kde-base/ark/ark-4.11.5.ebuild
index ebab866b63c9..c3235f846f40 100644
--- a/kde-base/ark/ark-4.11.5.ebuild
+++ b/kde-base/ark/ark-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="http://www.kde.org/applications/utilities/ark
 http://utils.kde.org/projects/ark"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="
diff --git a/kde-base/attica/attica-4.11.2.ebuild b/kde-base/attica/attica-4.11.2.ebuild
index ffeaa12f6c84..d36765d2c6ce 100644
--- a/kde-base/attica/attica-4.11.2.ebuild
+++ b/kde-base/attica/attica-4.11.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.11.2.ebuild,v 1.5 2013/12/11 20:27:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.11.2.ebuild,v 1.6 2014/01/20 10:25:32 kensington Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	>=dev-libs/libattica-0.1.4
+	>=dev-libs/libattica-0.1.4[qt4]
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/attica/attica-4.11.5.ebuild b/kde-base/attica/attica-4.11.5.ebuild
index 91833652b7a0..bab4101ae09a 100644
--- a/kde-base/attica/attica-4.11.5.ebuild
+++ b/kde-base/attica/attica-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.11.5.ebuild,v 1.1 2014/01/10 04:21:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.11.5.ebuild,v 1.3 2014/01/20 10:25:32 kensington Exp $
 
 EAPI=5
 
@@ -8,10 +8,10 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	>=dev-libs/libattica-0.1.4
+	>=dev-libs/libattica-0.1.4[qt4]
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/attica/attica-4.12.0.ebuild b/kde-base/attica/attica-4.12.0.ebuild
index fae669396f20..0503ace6c84f 100644
--- a/kde-base/attica/attica-4.12.0.ebuild
+++ b/kde-base/attica/attica-4.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.12.0.ebuild,v 1.1 2013/12/18 19:58:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.12.0.ebuild,v 1.2 2014/01/20 10:25:32 kensington Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	>=dev-libs/libattica-0.1.4
+	>=dev-libs/libattica-0.1.4[qt4]
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/attica/attica-4.12.1.ebuild b/kde-base/attica/attica-4.12.1.ebuild
index be77322798db..3ffffd95d775 100644
--- a/kde-base/attica/attica-4.12.1.ebuild
+++ b/kde-base/attica/attica-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.12.1.ebuild,v 1.1 2014/01/18 11:23:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.12.1.ebuild,v 1.2 2014/01/20 10:25:32 kensington Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	>=dev-libs/libattica-0.1.4
+	>=dev-libs/libattica-0.1.4[qt4]
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild b/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild
index 2826270dcf91..99d4d312ba53 100644
--- a/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild
+++ b/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/audiocd-kio/audiocd-kio-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug flac vorbis"
 
 DEPEND="
diff --git a/kde-base/blinken/blinken-4.11.5.ebuild b/kde-base/blinken/blinken-4.11.5.ebuild
index 2b1f9d663496..1ed0c60bfecb 100644
--- a/kde-base/blinken/blinken-4.11.5.ebuild
+++ b/kde-base/blinken/blinken-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.11.5.ebuild,v 1.1 2014/01/10 04:22:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE version of the Simon Says game."
 HOMEPAGE="http://www.kde.org/applications/education/blinken
 http://edu.kde.org/blinken"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/blogilo/blogilo-4.11.5.ebuild b/kde-base/blogilo/blogilo-4.11.5.ebuild
index 74cab607a120..f302004c5556 100644
--- a/kde-base/blogilo/blogilo-4.11.5.ebuild
+++ b/kde-base/blogilo/blogilo-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.11.5.ebuild,v 1.1 2014/01/10 04:22:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.11.5.ebuild,v 1.2 2014/01/20 08:00:01 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Blogging Client"
 HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/bomber/bomber-4.11.5.ebuild b/kde-base/bomber/bomber-4.11.5.ebuild
index 422424e906b7..dfde89ec801f 100644
--- a/kde-base/bomber/bomber-4.11.5.ebuild
+++ b/kde-base/bomber/bomber-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.11.5.ebuild,v 1.2 2014/01/20 08:00:31 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="http://www.kde.org/applications/games/bomber/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/bovo/bovo-4.11.5.ebuild b/kde-base/bovo/bovo-4.11.5.ebuild
index 51f5502a6c59..fb4229af2eda 100644
--- a/kde-base/bovo/bovo-4.11.5.ebuild
+++ b/kde-base/bovo/bovo-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.11.5.ebuild,v 1.2 2014/01/20 08:00:07 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="http://www.kde.org/applications/games/bovo/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild
index bc2a5d2d2f00..ecb6ec844b1f 100644
--- a/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild
+++ b/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild,v 1.1 2014/01/18 11:23:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/calendarjanitor/calendarjanitor-4.12.1.ebuild,v 1.3 2014/01/19 11:02:42 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="A tool to scan calendar data for buggy instances"
 HOMEPAGE="http://www.kde.org/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/cantor/cantor-4.11.5.ebuild b/kde-base/cantor/cantor-4.11.5.ebuild
index 6479b29f8804..b75a6bd89995 100644
--- a/kde-base/cantor/cantor-4.11.5.ebuild
+++ b/kde-base/cantor/cantor-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.11.5.ebuild,v 1.2 2014/01/20 08:00:57 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 HOMEPAGE="http://www.kde.org/applications/education/cantor http://edu.kde.org/cantor"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
diff --git a/kde-base/cervisia/cervisia-4.11.5.ebuild b/kde-base/cervisia/cervisia-4.11.5.ebuild
index 6f1c1ed22ba7..632c8a27c34e 100644
--- a/kde-base/cervisia/cervisia-4.11.5.ebuild
+++ b/kde-base/cervisia/cervisia-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
 HOMEPAGE="http://www.kde.org/applications/development/cervisia"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild b/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild
index 7d3347081eda..0625ff5e0581 100644
--- a/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild
+++ b/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild,v 1.1 2014/01/18 11:24:08 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/contactthemeeditor/contactthemeeditor-4.12.1.ebuild,v 1.3 2014/01/19 11:02:44 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A contact theme editor for KAddressBook"
 HOMEPAGE="http://www.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild
index f07aff54f22c..9c13b129f306 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild,v 1.1 2014/01/10 04:21:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="
diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild
index b14dd70f1f59..d36b428ffec8 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild,v 1.1 2014/01/18 11:23:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.12.1.ebuild,v 1.3 2014/01/19 11:02:38 ago Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="
diff --git a/kde-base/dolphin/dolphin-4.11.5.ebuild b/kde-base/dolphin/dolphin-4.11.5.ebuild
index f3e0484304ea..58f63410ca16 100644
--- a/kde-base/dolphin/dolphin-4.11.5.ebuild
+++ b/kde-base/dolphin/dolphin-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.5.ebuild,v 1.2 2014/01/20 08:00:13 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"
 HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-base/dragon/dragon-4.11.5.ebuild b/kde-base/dragon/dragon-4.11.5.ebuild
index f733c3da2ece..c441a7e213aa 100644
--- a/kde-base/dragon/dragon-4.11.5.ebuild
+++ b/kde-base/dragon/dragon-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragon/dragon-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragon/dragon-4.11.5.ebuild,v 1.2 2014/01/20 08:00:46 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Dragon Player is a simple video player for KDE 4"
 HOMEPAGE="http://www.kde.org/applications/multimedia/dragonplayer"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug xine"
 
 RDEPEND="
diff --git a/kde-base/drkonqi/drkonqi-4.11.5.ebuild b/kde-base/drkonqi/drkonqi-4.11.5.ebuild
index 64733a65105b..384165b2cb84 100644
--- a/kde-base/drkonqi/drkonqi-4.11.5.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.11.5.ebuild,v 1.2 2014/01/20 08:00:04 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild
index 1cf1b3fd3f05..654d4ece282c 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ffmpegthumbs/ffmpegthumbs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:01 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/filelight/filelight-4.11.5.ebuild b/kde-base/filelight/filelight-4.11.5.ebuild
index 9faf555a097b..c73715b2b28f 100644
--- a/kde-base/filelight/filelight-4.11.5.ebuild
+++ b/kde-base/filelight/filelight-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/filelight-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/filelight/filelight-4.11.5.ebuild,v 1.2 2014/01/20 08:00:13 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings
 HOMEPAGE="http://utils.kde.org/projects/filelight"
 
 LICENSE="GPL-3"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild
index 120aa72a5dd5..baa0d71f4323 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild,v 1.1 2014/01/10 04:21:32 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/freespacenotifier/freespacenotifier-4.11.5.ebuild,v 1.2 2014/01/20 08:00:02 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/granatier/granatier-4.11.5.ebuild b/kde-base/granatier/granatier-4.11.5.ebuild
index 57b21da3d28f..0318cf3ca9dc 100644
--- a/kde-base/granatier/granatier-4.11.5.ebuild
+++ b/kde-base/granatier/granatier-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/granatier/granatier-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="http://www.kde.org/applications/games/granatier/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/gwenview/gwenview-4.11.5.ebuild b/kde-base/gwenview/gwenview-4.11.5.ebuild
index bea73058a68a..a4f8b9c089f7 100644
--- a/kde-base/gwenview/gwenview-4.11.5.ebuild
+++ b/kde-base/gwenview/gwenview-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.11.5.ebuild,v 1.1 2014/01/10 04:21:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/graphics/gwenview/
 	http://gwenview.sourceforge.net/
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi semantic-desktop"
 
 # tests fail, last checked 4.11.0
diff --git a/kde-base/jovie/jovie-4.11.5.ebuild b/kde-base/jovie/jovie-4.11.5.ebuild
index f73555667e7e..2dc908e10e2c 100644
--- a/kde-base/jovie/jovie-4.11.5.ebuild
+++ b/kde-base/jovie/jovie-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/jovie-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/jovie/jovie-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Jovie is a text to speech application"
 HOMEPAGE="http://www.kde.org/applications/utilities/jovie/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/juk/juk-4.11.5.ebuild b/kde-base/juk/juk-4.11.5.ebuild
index 0cb5b178cb31..af935a736e5a 100644
--- a/kde-base/juk/juk-4.11.5.ebuild
+++ b/kde-base/juk/juk-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.11.5.ebuild,v 1.1 2014/01/10 04:22:03 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Jukebox and music manager for KDE."
 HOMEPAGE="http://www.kde.org/applications/multimedia/juk/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kabcclient/kabcclient-4.11.5.ebuild b/kde-base/kabcclient/kabcclient-4.11.5.ebuild
index 2a6f6a5ec1ed..0a99b921370b 100644
--- a/kde-base/kabcclient/kabcclient-4.11.5.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ KMMODULE="console/${PN}"
 inherit kde4-meta
 
 DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kaccessible/kaccessible-4.11.5.ebuild b/kde-base/kaccessible/kaccessible-4.11.5.ebuild
index f44d85f149b9..01fef6074836 100644
--- a/kde-base/kaccessible/kaccessible-4.11.5.ebuild
+++ b/kde-base/kaccessible/kaccessible-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/kaccessible-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaccessible/kaccessible-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +speechd"
 
 DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
diff --git a/kde-base/kactivities/kactivities-4.11.5.ebuild b/kde-base/kactivities/kactivities-4.11.5.ebuild
index 53a959effa03..e409ad608a92 100644
--- a/kde-base/kactivities/kactivities-4.11.5.ebuild
+++ b/kde-base/kactivities/kactivities-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kactivities/kactivities-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Activity Manager"
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
diff --git a/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild b/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild
index f9429dde7bad..e431b1f65af4 100644
--- a/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="The KDE Address Book"
 HOMEPAGE="http://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kajongg/kajongg-4.11.5.ebuild b/kde-base/kajongg/kajongg-4.11.5.ebuild
index 78f56f66c5ac..418d18cd8204 100644
--- a/kde-base/kajongg/kajongg-4.11.5.ebuild
+++ b/kde-base/kajongg/kajongg-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.11.5.ebuild,v 1.2 2014/01/20 08:00:46 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
 
 DESCRIPTION="The classical Mah Jongg for four players"
 HOMEPAGE="http://www.kde.org/applications/games/kajongg/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-base/kalarm/kalarm-4.11.5.ebuild b/kde-base/kalarm/kalarm-4.11.5.ebuild
index c00806826779..6eb440693358 100644
--- a/kde-base/kalarm/kalarm-4.11.5.ebuild
+++ b/kde-base/kalarm/kalarm-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.11.5.ebuild,v 1.2 2014/01/20 08:00:11 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
 HOMEPAGE+=" http://userbase.kde.org/KAlarm"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kalgebra/kalgebra-4.11.5.ebuild b/kde-base/kalgebra/kalgebra-4.11.5.ebuild
index 1778380b378f..78fd75a11bc2 100644
--- a/kde-base/kalgebra/kalgebra-4.11.5.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.11.5.ebuild,v 1.1 2014/01/10 04:21:37 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.11.5.ebuild,v 1.2 2014/01/20 08:00:52 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit kde4-base
 DESCRIPTION="MathML-based graph calculator for KDE."
 HOMEPAGE="http://www.kde.org/applications/education/kalgebra
 http://edu.kde.org/kalgebra"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kalzium/kalzium-4.11.5.ebuild b/kde-base/kalzium/kalzium-4.11.5.ebuild
index fc18bdb9f92d..cb5222a83584 100644
--- a/kde-base/kalzium/kalzium-4.11.5.ebuild
+++ b/kde-base/kalzium/kalzium-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.11.5.ebuild,v 1.2 2014/01/20 08:00:30 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit kde4-base flag-o-matic
 DESCRIPTION="KDE: periodic table of the elements."
 HOMEPAGE="http://www.kde.org/applications/education/kalzium
 http://edu.kde.org/kalzium"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="editor debug +plasma solver"
 
 DEPEND="
diff --git a/kde-base/kamera/kamera-4.11.5.ebuild b/kde-base/kamera/kamera-4.11.5.ebuild
index f32f6e6ca4c5..9f6c31b41e18 100644
--- a/kde-base/kamera/kamera-4.11.5.ebuild
+++ b/kde-base/kamera/kamera-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.11.5.ebuild,v 1.1 2014/01/10 04:21:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kanagram/kanagram-4.11.5.ebuild b/kde-base/kanagram/kanagram-4.11.5.ebuild
index 9d0d3b00a234..675a95e5b3c6 100644
--- a/kde-base/kanagram/kanagram-4.11.5.ebuild
+++ b/kde-base/kanagram/kanagram-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.11.5.ebuild,v 1.2 2014/01/20 08:00:18 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE: letter order game."
 HOMEPAGE="http://www.kde.org/applications/education/kanagram
 http://edu.kde.org/kanagram"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kapman/kapman-4.11.5.ebuild b/kde-base/kapman/kapman-4.11.5.ebuild
index bcc187d7dbec..671672a3ab38 100644
--- a/kde-base/kapman/kapman-4.11.5.ebuild
+++ b/kde-base/kapman/kapman-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.11.5.ebuild,v 1.1 2014/01/10 04:22:03 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapman/kapman-4.11.5.ebuild,v 1.2 2014/01/20 08:00:47 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Pac-Man clone for KDE"
 HOMEPAGE="http://www.kde.org/applications/games/kapman/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild b/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild
index 88f5be53fe60..132c2bdcec4d 100644
--- a/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild,v 1.1 2014/01/10 04:21:34 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.11.5.ebuild,v 1.2 2014/01/20 08:00:01 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
 HOMEPAGE="http://www.kde.org/applications/development/kapptemplate"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kate/kate-4.11.5.ebuild b/kde-base/kate/kate-4.11.5.ebuild
index cbf244eac17a..23457b9fbd48 100644
--- a/kde-base/kate/kate-4.11.5.ebuild
+++ b/kde-base/kate/kate-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.11.5.ebuild,v 1.1 2014/01/10 04:21:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.11.5.ebuild,v 1.2 2014/01/20 08:00:52 kensington Exp $
 
 EAPI=5
 KDE_HANDBOOK="optional"
@@ -11,7 +11,7 @@ inherit python-single-r1 kde4-meta
 
 DESCRIPTION="Kate is an MDI texteditor."
 HOMEPAGE="http://www.kde.org/applications/utilities/kate http://kate-editor.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-base/katepart/katepart-4.11.5.ebuild b/kde-base/katepart/katepart-4.11.5.ebuild
index b2d9f1c843e5..61c2291c9313 100644
--- a/kde-base/katepart/katepart-4.11.5.ebuild
+++ b/kde-base/katepart/katepart-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.11.5.ebuild,v 1.2 2014/01/20 08:00:31 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Editor KPart"
 HOMEPAGE+=" http://kate-editor.org/about-katepart/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-base/katomic/katomic-4.11.5.ebuild b/kde-base/katomic/katomic-4.11.5.ebuild
index a7e5a572af14..62019da3b692 100644
--- a/kde-base/katomic/katomic-4.11.5.ebuild
+++ b/kde-base/katomic/katomic-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.11.5.ebuild,v 1.1 2014/01/10 04:21:25 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/katomic/
 	http://games.kde.org/game.php?game=katomic
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kblackbox/kblackbox-4.11.5.ebuild b/kde-base/kblackbox/kblackbox-4.11.5.ebuild
index f235d7f3baca..5b006ce7d91f 100644
--- a/kde-base/kblackbox/kblackbox-4.11.5.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kblocks/kblocks-4.11.5.ebuild b/kde-base/kblocks/kblocks-4.11.5.ebuild
index 2766276d3d13..028190614444 100644
--- a/kde-base/kblocks/kblocks-4.11.5.ebuild
+++ b/kde-base/kblocks/kblocks-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblocks/kblocks-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
 HOMEPAGE="http://www.kde.org/applications/games/kblocks/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kbounce/kbounce-4.11.5.ebuild b/kde-base/kbounce/kbounce-4.11.5.ebuild
index 51fe67193c28..074724727e38 100644
--- a/kde-base/kbounce/kbounce-4.11.5.ebuild
+++ b/kde-base/kbounce/kbounce-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.11.5.ebuild,v 1.1 2014/01/10 04:21:55 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kbounce/
 	http://games.kde.org/game.php?game=kbounce
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kbreakout/kbreakout-4.11.5.ebuild b/kde-base/kbreakout/kbreakout-4.11.5.ebuild
index cbea77be40ab..ceac6e8e8d15 100644
--- a/kde-base/kbreakout/kbreakout-4.11.5.ebuild
+++ b/kde-base/kbreakout/kbreakout-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbreakout/kbreakout-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kbreakout/
 	http://games.kde.org/game.php?game=kbreakout
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kbruch/kbruch-4.11.5.ebuild b/kde-base/kbruch/kbruch-4.11.5.ebuild
index 9a48bc70a919..8499e9e5f5be 100644
--- a/kde-base/kbruch/kbruch-4.11.5.ebuild
+++ b/kde-base/kbruch/kbruch-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.11.5.ebuild,v 1.1 2014/01/10 04:21:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-4.11.5.ebuild,v 1.2 2014/01/20 08:00:07 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
 HOMEPAGE="http://www.kde.org/applications/education/kbruch http://edu.kde.org/kbruch"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild b/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild
index 58709d10f0c0..793635c75e40 100644
--- a/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.11.5.ebuild,v 1.2 2014/01/20 08:00:03 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE Frontend for Cachegrind"
 HOMEPAGE="http://www.kde.org/applications/development/kcachegrind
 http://kcachegrind.sourceforge.net"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kcalc/kcalc-4.11.5.ebuild b/kde-base/kcalc/kcalc-4.11.5.ebuild
index 0b7cb2a5bfac..4356202f1245 100644
--- a/kde-base/kcalc/kcalc-4.11.5.ebuild
+++ b/kde-base/kcalc/kcalc-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-base
 DESCRIPTION="KDE calculator"
 HOMEPAGE="http://www.kde.org/applications/utilities/kcalc
 http://utils.kde.org/projects/kcalc"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kcharselect/kcharselect-4.11.5.ebuild b/kde-base/kcharselect/kcharselect-4.11.5.ebuild
index f84a87ed4338..eaf6ead4ef4f 100644
--- a/kde-base/kcharselect/kcharselect-4.11.5.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.11.5.ebuild,v 1.1 2014/01/10 04:21:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-4.11.5.ebuild,v 1.2 2014/01/20 08:00:15 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE character selection utility"
 HOMEPAGE="http://www.kde.org/applications/utilities/kcharselect
 http://utils.kde.org/projects/kcharselect"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild
index 3de5a92d60ee..adfe76bab54d 100644
--- a/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild,v 1.1 2014/01/10 04:21:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.11.5.ebuild,v 1.2 2014/01/20 08:00:04 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug pam"
 
 RDEPEND="
diff --git a/kde-base/kcminit/kcminit-4.11.5.ebuild b/kde-base/kcminit/kcminit-4.11.5.ebuild
index e992de51de4c..770e04329dbf 100644
--- a/kde-base/kcminit/kcminit-4.11.5.ebuild
+++ b/kde-base/kcminit/kcminit-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.11.5.ebuild,v 1.1 2014/01/10 04:21:34 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.11.5.ebuild,v 1.2 2014/01/20 08:00:31 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kcmshell/kcmshell-4.11.5.ebuild b/kde-base/kcmshell/kcmshell-4.11.5.ebuild
index 7b9fb12beddd..9265a28c3608 100644
--- a/kde-base/kcmshell/kcmshell-4.11.5.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcmshell/kcmshell-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild
index 7f53d727c458..6a9ae393d484 100644
--- a/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcolorchooser/kcolorchooser-4.11.5.ebuild,v 1.2 2014/01/20 08:00:27 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="http://www.kde.org/applications/graphics/kcolorchooser/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kcontrol/kcontrol-4.11.5.ebuild b/kde-base/kcontrol/kcontrol-4.11.5.ebuild
index 5e2650e18b01..817ab4cbebd7 100644
--- a/kde-base/kcontrol/kcontrol-4.11.5.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.11.5.ebuild,v 1.1 2014/01/10 04:22:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kcron/kcron-4.11.5.ebuild b/kde-base/kcron/kcron-4.11.5.ebuild
index c35a7b191567..41c1a1baf227 100644
--- a/kde-base/kcron/kcron-4.11.5.ebuild
+++ b/kde-base/kcron/kcron-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.11.5.ebuild,v 1.1 2014/01/10 04:21:45 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="!prefix? ( virtual/cron )"
diff --git a/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild b/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild
index 28aaf7b05889..deffa92d4bd2 100644
--- a/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild
+++ b/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild,v 1.1 2014/01/10 04:21:31 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-base-artwork/kde-base-artwork-4.11.5.ebuild,v 1.2 2014/01/20 08:00:33 kensington Exp $
 
 EAPI=5
 
@@ -9,4 +9,4 @@ inherit kde4-base
 
 DESCRIPTION="KDE base artwork"
 IUSE=""
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild b/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild
index 656ec66b2005..54ecd4195219 100644
--- a/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild
+++ b/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-dev-scripts/kde-dev-scripts-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Development Scripts"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild b/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild
index 854562bfffd0..5dca1f2b471b 100644
--- a/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild
+++ b/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild,v 1.1 2014/01/10 04:21:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-dev-utils/kde-dev-utils-4.11.5.ebuild,v 1.2 2014/01/20 08:00:11 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Development Utilities"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kde-env/kde-env-4.11.5.ebuild b/kde-base/kde-env/kde-env-4.11.5.ebuild
index 0617f14e2f1c..d214120d35e8 100644
--- a/kde-base/kde-env/kde-env-4.11.5.ebuild
+++ b/kde-base/kde-env/kde-env-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.11.5.ebuild,v 1.2 2014/01/20 08:00:52 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Environment setting required for all KDE4 apps to run."
 SRC_URI=""
 ESVN_REPO_URI=""
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild b/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild
index 89c7d20a5726..6e6f01c8f174 100644
--- a/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.11.5.ebuild,v 1.2 2014/01/20 08:00:57 kensington Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ DEPEND="
 "
 RDEPEND="!<kde-base/konq-plugins-4.6"
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
diff --git a/kde-base/kde-meta/kde-meta-4.11.5.ebuild b/kde-base/kde-meta/kde-meta-4.11.5.ebuild
index 3d87a6ee8e6b..35b48ddd6d42 100644
--- a/kde-base/kde-meta/kde-meta-4.11.5.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:01 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:57 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kde-meta/kde-meta-4.12.1.ebuild b/kde-base/kde-meta/kde-meta-4.12.1.ebuild
index 81301ceeb55b..d3f5555503d0 100644
--- a/kde-base/kde-meta/kde-meta-4.12.1.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.12.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.12.1.ebuild,v 1.1 2014/01/18 11:24:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.12.1.ebuild,v 1.3 2014/01/19 11:03:00 ago Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild
index a203c28e5b86..cb769b4327e2 100644
--- a/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild
+++ b/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-wallpapers/kde-wallpapers-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KDE_SCM="svn"
 inherit kde4-base
 
 DESCRIPTION="KDE wallpapers"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_configure() {
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild
index d7e0c5831801..c9864466addc 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild
index fa85fcf2cf8e..5b97e0bb4dab 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild
index 3396defe81ff..5d73752dfe18 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild,v 1.1 2014/01/10 04:21:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE extra colorschemes"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild
index 42778f538251..3430ee019049 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.11.5.ebuild,v 1.2 2014/01/20 08:00:37 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild
index fa4238e34976..6898ecef07ab 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild,v 1.1 2014/01/10 04:21:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
@@ -12,5 +12,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild
index eb1efb513d51..9e077bcbf2f5 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild,v 1.1 2014/01/10 04:22:04 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Provides nuvola icon theme
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild
index a6cb1eb1a13b..99230b38e321 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild,v 1.1 2014/01/10 04:21:34 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +eigen +kexiv2 xscreensaver"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild
index ec3adb1c4b92..c25f79a340de 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild
index 5689d6060e8c..cecf803327ac 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.11.5.ebuild,v 1.2 2014/01/20 08:00:34 kensington Exp $
 
 EAPI=5
 
@@ -12,5 +12,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra sound themes for kde"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild
index 7ebf1a6d3f3f..85a507151d68 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild
index 87dc47ce9fdf..5e4ecfa7ef41 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild,v 1.1 2014/01/10 04:21:32 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 KMEXTRA="
diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild
index d160f23b0478..03a3110659e2 100644
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild,v 1.1 2014/01/10 04:21:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.11.5.ebuild,v 1.2 2014/01/20 08:00:05 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild
index 70d54ad49f1e..528ce0d08cbc 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-cursors/kdebase-cursors-4.11.5.ebuild,v 1.2 2014/01/20 08:00:28 kensington Exp $
 
 EAPI=5
 
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"
 IUSE=""
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild b/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild
index 5d9c1cf7a7ab..18bc4037c865 100644
--- a/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild,v 1.1 2014/01/10 04:22:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
 IUSE="+wallpapers"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild
index 916fa0143f5f..b1d2d5b382dc 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild,v 1.1 2014/01/10 04:21:37 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.11.5.ebuild,v 1.2 2014/01/20 08:00:14 kensington Exp $
 
 EAPI=5
 
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="Oxygen KDE4 desktop theme."
 IUSE=""
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild
index 0a342df5d966..aebc3d7026ec 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild,v 1.1 2014/01/10 04:21:32 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
 IUSE="+bzip2 exif debug lzma openexr samba +sftp"
 
diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild
index b62106f2f6c2..6471ba555357 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild,v 1.1 2014/01/10 04:22:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.11.5.ebuild,v 1.2 2014/01/20 08:00:34 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ KMMODULE="menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu icons"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild
index 87fa93dc8971..dc7c59b06061 100644
--- a/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-menu/kdebase-menu-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ KMMODULE="kde-menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE Menu query tool."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild
index 18414a556d27..458b9fe91d48 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:15 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 RDEPEND="
diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild
index 98fc2693be00..fb4ac450e233 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+handbook semantic-desktop"
 
 RDEPEND="
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild
index 04fc2f741f43..c07ed01790f6 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta prefix
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 # The KDE apps called from the startkde script.
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild
index 4ebc76f96981..1e422f4b6da7 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:55 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="csharp java perl python ruby"
 
 RDEPEND="
diff --git a/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild
index 058d9d5c8370..4acac2c2ddfe 100644
--- a/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-4.11.5.ebuild,v 1.2 2014/01/20 08:00:55 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild
index 81b8dc4001e4..010fd13ae251 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://edu.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild
index 91b58ed0ba19..0be27e946095 100644
--- a/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:09 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="http://games.kde.org/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild
index bdcb0ad3babe..505a20ec7923 100644
--- a/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild,v 1.1 2014/01/18 11:24:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.12.1.ebuild,v 1.2 2014/01/19 10:58:49 ago Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="http://games.kde.org/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild
index c52e2bb7882b..3083717e9092 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:34 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:09 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
 HOMEPAGE="http://www.kde.org/applications/graphics/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild
index 249b4bb2bd89..077e74de1024 100644
--- a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild
+++ b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.11.5.ebuild,v 1.2 2014/01/20 08:00:10 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep okular)"
diff --git a/kde-base/kdegraphics-strigi-analyzer/Manifest b/kde-base/kdegraphics-strigi-analyzer/Manifest
deleted file mode 100644
index 75ad82db42ea..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdegraphics-strigi-analyzer-4.10.5.tar.xz 41276 SHA256 a594e8dfc8dfc5cbea1c16762f44170c9b3c1c29528a8e4f7afd16eeeab7e31f SHA512 a1bb56dc08f4d98a206b424a0d0ee1228062fb62f4e423cea52070b9abc47fe635b6bb6d9d888b2e044601f8c7988f32c1c8a003ea92cd7f9f2b6d50f23bc3ef WHIRLPOOL ee7faf422095a05e3ab9592cf0587e4c43b7c13d860b108a1ab0f4108493a89235ba9224fab4b71bd92dc04bfabba560f1f8094082bf0909a12926c1100a6d35
diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.10.5.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.10.5.ebuild
deleted file mode 100644
index 9ec54e8ed36e..000000000000
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.10.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.10.5.ebuild,v 1.5 2013/08/02 14:29:10 ago Exp $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild b/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild
index 2cc8fd31a6da..2a34e5313c76 100644
--- a/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild,v 1.5 2013/12/11 20:27:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.2-r1.ebuild,v 1.6 2014/01/20 10:24:01 kensington Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=app-misc/strigi-0.7.7
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libattica-0.4.2[qt4]
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
diff --git a/kde-base/kdelibs/kdelibs-4.11.5.ebuild b/kde-base/kdelibs/kdelibs-4.11.5.ebuild
index c4bf300e19ca..47af8745ccf5 100644
--- a/kde-base/kdelibs/kdelibs-4.11.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.5.ebuild,v 1.1 2014/01/10 04:22:04 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.5.ebuild,v 1.3 2014/01/20 10:24:01 kensington Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ EGIT_BRANCH="KDE/4.11"
 
 DESCRIPTION="KDE libraries needed by all KDE programs."
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
 mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=app-misc/strigi-0.7.7
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libattica-0.4.2[qt4]
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
diff --git a/kde-base/kdelibs/kdelibs-4.12.0.ebuild b/kde-base/kdelibs/kdelibs-4.12.0.ebuild
index bc2ce2456a86..16f13ccb44be 100644
--- a/kde-base/kdelibs/kdelibs-4.12.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.0.ebuild,v 1.1 2013/12/18 19:57:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.0.ebuild,v 1.2 2014/01/20 10:24:01 kensington Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=app-misc/strigi-0.7.7
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libattica-0.4.2[qt4]
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
diff --git a/kde-base/kdelibs/kdelibs-4.12.1.ebuild b/kde-base/kdelibs/kdelibs-4.12.1.ebuild
index 82f1ea34e968..b2c44bd8c6da 100644
--- a/kde-base/kdelibs/kdelibs-4.12.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.1.ebuild,v 1.1 2014/01/18 11:23:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.1.ebuild,v 1.2 2014/01/20 10:24:01 kensington Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ COMMONDEPEND="
 	>=app-misc/strigi-0.7.7
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
+	>=dev-libs/libattica-0.4.2[qt4]
 	>=dev-libs/libdbusmenu-qt-0.3.2
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild
index fb13687b6425..a4c8b92220d9 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
@@ -10,7 +10,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/multimedia/
 	http://multimedia.kde.org/
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="ffmpeg +mplayer"
 
 RDEPEND="
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild
index 2e867bf83989..980d0c48fb58 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild,v 1.1 2014/01/10 04:22:04 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild
index 916a13a7dafe..681cd403cf22 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="ppp"
 
 RDEPEND="
diff --git a/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild b/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild
index 909d45017e90..2dd655a99d96 100644
--- a/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild,v 1.1 2014/01/10 04:21:28 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild
index dab392337ff2..4c863ce4e6be 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:57 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta
 
 DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild
index 623812fffa35..f8d4f5c21bf9 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.11.5.ebuild,v 1.2 2014/01/20 08:00:37 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM icons"
 IUSE=""
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="$(add_kdebase_dep kdepimlibs)"
 RDEPEND=""
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild
index 8730d5b0d6df..5214bce261c1 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild,v 1.1 2014/01/10 04:22:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.11.5.ebuild,v 1.2 2014/01/20 08:00:08 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM groupware plugin collection"
 IUSE="debug"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild
index 2f9c08d0e87c..79c61af08871 100644
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild,v 1.1 2014/01/10 04:22:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/kdepim-l10n-4.11.5.ebuild,v 1.2 2014/01/20 08:00:45 kensington Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ DEPEND="
 "
 RDEPEND=""
 
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild
index 80e6d8072591..4a371079e870 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:28 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 HOMEPAGE+=" http://community.kde.org/KDE_PIM"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild
index 2c72a6d56fe5..7efc1d7e24a3 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild,v 1.1 2014/01/18 11:23:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.12.1.ebuild,v 1.3 2014/01/19 11:02:48 ago Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 HOMEPAGE+=" http://community.kde.org/KDE_PIM"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild
index 28d9182c7f6a..e497278568c7 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.11.5.ebuild,v 1.2 2014/01/20 08:00:08 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kdepim-runtime"
 inherit kde4-base
 
 DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug facebook google kolab"
 
 RESTRICT="test"
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild
index f3b9fc649dd8..caf92bf79ead 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE PIM apps."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="debug ldap prison"
 
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild
index bd23ca791644..e4b3fd9c3abf 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild,v 1.6 2013/12/11 20:27:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.2-r1.ebuild,v 1.7 2014/01/20 10:27:26 kensington Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	$(add_kdebase_dep krunner)
 	$(add_kdebase_dep plasma-workspace 'semantic-desktop?')
 	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	fcitx? ( app-i18n/fcitx[dbus(+)] )
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild
index 639fccfe0e23..68d42c1b56ab 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.11.5.ebuild,v 1.3 2014/01/20 10:27:26 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim
 semantic-desktop"
 
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	$(add_kdebase_dep krunner)
 	$(add_kdebase_dep plasma-workspace 'semantic-desktop?')
 	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	fcitx? ( app-i18n/fcitx[dbus(+)] )
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild
index 775fda618a60..01c5cd6d4893 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild,v 1.1 2013/12/18 19:58:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.0.ebuild,v 1.2 2014/01/20 10:27:26 kensington Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	$(add_kdebase_dep krunner '' 4.11)
 	$(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11)
 	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	fcitx? ( app-i18n/fcitx[dbus(+)] )
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild
index 79b08519a3d9..e76c3b5791cd 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild,v 1.1 2014/01/18 11:24:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.1.ebuild,v 1.2 2014/01/20 10:27:26 kensington Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	$(add_kdebase_dep krunner '' 4.11)
 	$(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11)
 	x11-misc/shared-mime-info
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	fcitx? ( app-i18n/fcitx[dbus(+)] )
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild
index 964b5d49f9ea..4b1573ccf713 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug subversion"
 KMNAME="kdesdk-kioslaves"
 
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild
index a98b4bfbe3d4..1b4ea0e91b3a 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:40 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="http://www.kde.org/applications/development"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cvs"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild
index d0ad431218aa..dc8607726cd0 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild,v 1.1 2014/01/18 11:23:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-4.12.1.ebuild,v 1.3 2014/01/19 11:02:54 ago Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="http://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cvs"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-misc/Manifest b/kde-base/kdesdk-misc/Manifest
deleted file mode 100644
index 304d1fdc63a5..000000000000
--- a/kde-base/kdesdk-misc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdesdk-4.10.5.tar.xz 5261616 SHA256 e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 SHA512 2b80d55bba915a443c8c4e7314b850127bdd02fd82fe7c4513064cfade9a7bf486af60b6be1d0d2836c11ceb12d81f8e37f8ef0aabe44fbd99869e7be00dd29b WHIRLPOOL 120e346dede35838785f62eca49daa52fdb73d6e3f4b94ee058bd1c443402037f220a762e7dd92895def4be238b6a65d0dfe0724b9b38f678669db0a1feaffdd
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.5.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.5.ebuild
deleted file mode 100644
index 5f09e0f6e9a8..000000000000
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-4.10.5.ebuild,v 1.5 2013/08/02 14:29:43 ago Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kde-dev-utils"
-else
-	KMEXTRA="poxml/"
-	KMNAME="kdesdk"
-	KMMODULE="kde-dev-utils"
-fi
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug extras"
-
-KMEXTRA+="
-	${KMMODULE}/kmtrace/
-	${KMMODULE}/kpartloader/
-	${KMMODULE}/kprofilemethod/
-"
-
-DEPEND="
-	extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] )
-"
-RDEPEND="${DEPEND}"
-
-add_blocker poxml '<4.10.1'
-
-# java deps on anltr cant be properly explained to cmake deps
-# needs to be run in one thread
-MAKEOPTS+=" -j1"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with extras Antlr2)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
deleted file mode 100644
index 304d1fdc63a5..000000000000
--- a/kde-base/kdesdk-scripts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdesdk-4.10.5.tar.xz 5261616 SHA256 e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 SHA512 2b80d55bba915a443c8c4e7314b850127bdd02fd82fe7c4513064cfade9a7bf486af60b6be1d0d2836c11ceb12d81f8e37f8ef0aabe44fbd99869e7be00dd29b WHIRLPOOL 120e346dede35838785f62eca49daa52fdb73d6e3f4b94ee058bd1c443402037f220a762e7dd92895def4be238b6a65d0dfe0724b9b38f678669db0a1feaffdd
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.5.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.5.ebuild
deleted file mode 100644
index 6c5a9203bba1..000000000000
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.10.5.ebuild,v 1.5 2013/08/02 14:29:48 ago Exp $
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-if [[ ${PV} == *9999 ]]; then
-	eclass="kde4-base"
-	KMNAME="kde-dev-scripts"
-	KMMODULE="."
-else
-	eclass="kde4-meta"
-	KMNAME="kdesdk"
-	KMMODULE="kde-dev-scripts"
-fi
-inherit ${eclass}
-
-DESCRIPTION="KDE SDK Scripts"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' ${KMMODULE}/CMakeLists.txt || die
-
-	${eclass}_src_prepare
-}
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild
index 77b6f1a1e79c..1edf5500e1b3 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kdesdk-strigi-analyzers"
 inherit kde4-base
 
 DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kdesu/kdesu-4.11.5.ebuild b/kde-base/kdesu/kdesu-4.11.5.ebuild
index cb1ccededb43..81200c98721b 100644
--- a/kde-base/kdesu/kdesu-4.11.5.ebuild
+++ b/kde-base/kdesu/kdesu-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.11.5.ebuild,v 1.1 2014/01/10 04:22:20 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit kde4-meta
 # if not, USE-flag ?
 DESCRIPTION="KDE: gui for su(1)"
 HOMEPAGE+=" http://techbase.kde.org/Projects/kdesu"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild
index 7704a8ca79ec..f357997107d7 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
 HOMEPAGE+=" http://techbase.kde.org/Projects/Kdetoys"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild
index 3889ce2ec689..4492525aa3fc 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups floppy lirc"
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild
index ca26c6cfaf4a..f09e65953ce3 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdf/kdf-4.11.5.ebuild b/kde-base/kdf/kdf-4.11.5.ebuild
index f4ad200c0e52..dc246199ac71 100644
--- a/kde-base/kdf/kdf-4.11.5.ebuild
+++ b/kde-base/kdf/kdf-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE free disk space utility"
 HOMEPAGE="http://utils.kde.org/projects/kdf"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdialog/kdialog-4.11.5.ebuild b/kde-base/kdialog/kdialog-4.11.5.ebuild
index 3d00c4811a6f..0a6baabe4894 100644
--- a/kde-base/kdialog/kdialog-4.11.5.ebuild
+++ b/kde-base/kdialog/kdialog-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.11.5.ebuild,v 1.1 2014/01/10 04:21:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kdiamond/kdiamond-4.11.5.ebuild b/kde-base/kdiamond/kdiamond-4.11.5.ebuild
index 59dcf8f2ecce..868316d64bd6 100644
--- a/kde-base/kdiamond/kdiamond-4.11.5.ebuild
+++ b/kde-base/kdiamond/kdiamond-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.11.5.ebuild,v 1.1 2014/01/10 04:21:45 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdiamond/kdiamond-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kdiamond/
 	http://games.kde.org/game.php?game=kdiamond
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kdm/kdm-4.11.5.ebuild b/kde-base/kdm/kdm-4.11.5.ebuild
index 3a56adb6f232..e1dad611d3f7 100644
--- a/kde-base/kdm/kdm-4.11.5.ebuild
+++ b/kde-base/kdm/kdm-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.5.ebuild,v 1.2 2014/01/20 08:00:08 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit systemd kde4-meta flag-o-matic user
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +consolekit kerberos pam systemd"
 
 REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
diff --git a/kde-base/kdnssd/kdnssd-4.11.5.ebuild b/kde-base/kdnssd/kdnssd-4.11.5.ebuild
index a2a4efbf50a2..4cf8d43672ab 100644
--- a/kde-base/kdnssd/kdnssd-4.11.5.ebuild
+++ b/kde-base/kdnssd/kdnssd-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-4.11.5.ebuild,v 1.2 2014/01/20 08:00:11 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug zeroconf"
 
 DEPEND="
diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild
index 80746fd686a0..4079d67142ae 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild,v 1.1 2014/01/10 04:21:37 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdontchangethehostname/kdontchangethehostname-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform KDE about a change in hostname"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild
index cbdde0a29eec..5624fb4d285c 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild b/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild
index 694365f7e2e0..cec6491ca41c 100644
--- a/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild,v 1.1 2014/01/10 04:22:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditfiletype/keditfiletype-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.89
diff --git a/kde-base/kephal/kephal-4.11.5.ebuild b/kde-base/kephal/kephal-4.11.5.ebuild
index 20c0b0f119e6..5dab06219a01 100644
--- a/kde-base/kephal/kephal-4.11.5.ebuild
+++ b/kde-base/kephal/kephal-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.11.5.ebuild,v 1.1 2014/01/10 04:21:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kephal/kephal-4.11.5.ebuild,v 1.2 2014/01/20 08:00:55 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="libs/kephal"
 inherit kde4-meta
 
 DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kfile/kfile-4.11.5.ebuild b/kde-base/kfile/kfile-4.11.5.ebuild
index ea1857a14fab..8f29e0046ae0 100644
--- a/kde-base/kfile/kfile-4.11.5.ebuild
+++ b/kde-base/kfile/kfile-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.11.5.ebuild,v 1.1 2014/01/10 04:21:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfile/kfile-4.11.5.ebuild,v 1.2 2014/01/20 08:00:13 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild b/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild
index 38c4a15419ea..fd0796095a9b 100644
--- a/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild,v 1.1 2014/01/10 04:21:37 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 KDE_HANDBOOK="optional"
@@ -10,5 +10,5 @@ inherit kde4-meta
 
 DESCRIPTION="KDE web development - powerful search and replace in multiple files"
 HOMEPAGE="http://www.kde.org/applications/utilities/kfilereplace/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfind/kfind-4.11.5.ebuild b/kde-base/kfind/kfind-4.11.5.ebuild
index 94bc8ebed02d..fff84a721d96 100644
--- a/kde-base/kfind/kfind-4.11.5.ebuild
+++ b/kde-base/kfind/kfind-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.11.5.ebuild,v 1.1 2014/01/10 04:21:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
 HOMEPAGE="http://www.kde.org/applications/utilities/kfind/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kfloppy/kfloppy-4.11.5.ebuild b/kde-base/kfloppy/kfloppy-4.11.5.ebuild
index 2811a3b05eb9..f3114babdf43 100644
--- a/kde-base/kfloppy/kfloppy-4.11.5.ebuild
+++ b/kde-base/kfloppy/kfloppy-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.11.5.ebuild,v 1.1 2014/01/10 04:21:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-4.11.5.ebuild,v 1.2 2014/01/20 08:00:06 kensington Exp $
 
 EAPI=5
 
@@ -12,5 +12,5 @@ HOMEPAGE="
 	http://www.kde.org/applications/utilities/kfloppy/
 	http://utils.kde.org/projects/kfloppy/
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kfmclient/kfmclient-4.11.5.ebuild b/kde-base/kfmclient/kfmclient-4.11.5.ebuild
index c2dc4f11a32c..793c614c4046 100644
--- a/kde-base/kfmclient/kfmclient-4.11.5.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.11.5.ebuild,v 1.1 2014/01/10 04:21:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfmclient/kfmclient-4.11.5.ebuild,v 1.2 2014/01/20 08:00:18 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="konqueror/client"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-base/kfourinline/kfourinline-4.11.5.ebuild b/kde-base/kfourinline/kfourinline-4.11.5.ebuild
index 605406721898..33ed2ceee5c3 100644
--- a/kde-base/kfourinline/kfourinline-4.11.5.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.11.5.ebuild,v 1.2 2014/01/20 08:00:11 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kfourinline/
 	http://games.kde.org/game.php?game=kfourinline
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kgamma/kgamma-4.11.5.ebuild b/kde-base/kgamma/kgamma-4.11.5.ebuild
index 0a52a7a66389..f534f57afbc5 100644
--- a/kde-base/kgamma/kgamma-4.11.5.ebuild
+++ b/kde-base/kgamma/kgamma-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.11.5.ebuild,v 1.1 2014/01/10 04:21:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-4.11.5.ebuild,v 1.2 2014/01/20 08:00:09 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kgeography/kgeography-4.11.5.ebuild b/kde-base/kgeography/kgeography-4.11.5.ebuild
index 3f0f639931cd..54cedfcad392 100644
--- a/kde-base/kgeography/kgeography-4.11.5.ebuild
+++ b/kde-base/kgeography/kgeography-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.11.5.ebuild,v 1.1 2014/01/10 04:21:45 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE: a geography learning tool"
 HOMEPAGE="http://edu.kde.org/applications/miscellaneous/kgeography
 http://edu.kde.org/applications/all/kgeography"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kget/kget-4.11.5.ebuild b/kde-base/kget/kget-4.11.5.ebuild
index d366e843d23f..ca9e1e7b5e52 100644
--- a/kde-base/kget/kget-4.11.5.ebuild
+++ b/kde-base/kget/kget-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.11.5.ebuild,v 1.1 2014/01/10 04:22:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="An advanced download manager for KDE"
 HOMEPAGE="http://www.kde.org/applications/internet/kget/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
 
 RDEPEND="
diff --git a/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild
index cd007e7bcd34..597aed531d29 100644
--- a/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild,v 1.1 2014/01/10 04:21:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kglobalaccel/kglobalaccel-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild
index b5f886151d70..16078aa0ec08 100644
--- a/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-4.11.5.ebuild,v 1.2 2014/01/20 08:00:02 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kgoldrunner/
 	http://games.kde.org/game.php?game=kgoldrunner
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kgpg/kgpg-4.11.5.ebuild b/kde-base/kgpg/kgpg-4.11.5.ebuild
index 3f7149fe5dab..15fbb36f4080 100644
--- a/kde-base/kgpg/kgpg-4.11.5.ebuild
+++ b/kde-base/kgpg/kgpg-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.11.5.ebuild,v 1.1 2014/01/10 04:22:04 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.11.5.ebuild,v 1.2 2014/01/20 08:00:11 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-base
 DESCRIPTION="KDE gpg keyring manager"
 HOMEPAGE="http://www.kde.org/applications/utilities/kgpg
 http://utils.kde.org/projects/kgpg"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/khangman/khangman-4.11.5.ebuild b/kde-base/khangman/khangman-4.11.5.ebuild
index 73d8205ccc68..a85da71dd0f8 100644
--- a/kde-base/khangman/khangman-4.11.5.ebuild
+++ b/kde-base/khangman/khangman-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.11.5.ebuild,v 1.2 2014/01/20 08:00:18 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="Classical hangman game for KDE"
 HOMEPAGE="http://www.kde.org/applications/education/khangman
 http://edu.kde.org/khangman"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild b/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild
index 3ed13a5f589c..3efdb2a655df 100644
--- a/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild,v 1.1 2014/01/10 04:21:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.11.5.ebuild,v 1.2 2014/01/20 08:00:37 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" http://userbase.kde.org/KHelpCenter"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/khotkeys/khotkeys-4.11.5.ebuild b/kde-base/khotkeys/khotkeys-4.11.5.ebuild
index 3a9e77003dbf..773568cc4502 100644
--- a/kde-base/khotkeys/khotkeys-4.11.5.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.11.5.ebuild,v 1.1 2014/01/10 04:22:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.11.5.ebuild,v 1.2 2014/01/20 08:00:21 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild b/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild
index 83af99addc6c..50178582885e 100644
--- a/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild,v 1.1 2014/01/10 04:22:11 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconfinder/kiconfinder-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kig/kig-4.11.5.ebuild b/kde-base/kig/kig-4.11.5.ebuild
index 25baf52764bd..fd7cbcc0cae4 100644
--- a/kde-base/kig/kig-4.11.5.ebuild
+++ b/kde-base/kig/kig-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.11.5.ebuild,v 1.1 2014/01/10 04:21:28 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
 
 DESCRIPTION="KDE Interactive Geometry tool"
 HOMEPAGE="http://www.kde.org/applications/education/kig http://edu.kde.org/kig"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-base/kigo/kigo-4.11.5.ebuild b/kde-base/kigo/kigo-4.11.5.ebuild
index ebbf555b1a74..b36a460bb71a 100644
--- a/kde-base/kigo/kigo-4.11.5.ebuild
+++ b/kde-base/kigo/kigo-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kigo/kigo-4.11.5.ebuild,v 1.2 2014/01/20 08:00:30 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Go game"
 HOMEPAGE="http://www.kde.org/applications/games/kigo/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/killbots/killbots-4.11.5.ebuild b/kde-base/killbots/killbots-4.11.5.ebuild
index 6821657a72e7..6b13b1c8f01d 100644
--- a/kde-base/killbots/killbots-4.11.5.ebuild
+++ b/kde-base/killbots/killbots-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/killbots-4.11.5.ebuild,v 1.2 2014/01/20 08:00:28 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="Kill the bots or they kill you!"
 HOMEPAGE="http://www.kde.org/applications/games/killbots/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild
index 8f387910e858..17b38ce761e9 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 
@@ -11,5 +11,5 @@ inherit kde4-meta
 
 DESCRIPTION="KDE web development - image map editor"
 HOMEPAGE="http://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kimgio/kimgio-4.11.5.ebuild b/kde-base/kimgio/kimgio-4.11.5.ebuild
index c94c87cdc496..3fa51670b28b 100644
--- a/kde-base/kimgio/kimgio-4.11.5.ebuild
+++ b/kde-base/kimgio/kimgio-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimgio/kimgio-4.11.5.ebuild,v 1.2 2014/01/10 06:11:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimgio/kimgio-4.11.5.ebuild,v 1.3 2014/01/20 08:00:26 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE WebP image format plugin"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="media-libs/libwebp:="
diff --git a/kde-base/kimono/kimono-4.11.5.ebuild b/kde-base/kimono/kimono-4.11.5.ebuild
index f8cd87567e34..c32e74888f7e 100644
--- a/kde-base/kimono/kimono-4.11.5.ebuild
+++ b/kde-base/kimono/kimono-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/kimono-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimono/kimono-4.11.5.ebuild,v 1.2 2014/01/20 08:00:07 kensington Exp $
 
 EAPI=5
 
 inherit mono-env kde4-base
 
 DESCRIPTION="C# bindings for KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug plasma semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild
index f95cfcd0f856..2318138c8ef3 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.5.ebuild,v 1.2 2014/01/20 08:00:45 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="The KDE Info Center"
 HOMEPAGE="http://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ieee1394"
 
 DEPEND="
diff --git a/kde-base/kioclient/kioclient-4.11.5.ebuild b/kde-base/kioclient/kioclient-4.11.5.ebuild
index 57fcc4fdda2b..7fc007210e1d 100644
--- a/kde-base/kioclient/kioclient-4.11.5.ebuild
+++ b/kde-base/kioclient/kioclient-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.11.5.ebuild,v 1.1 2014/01/10 04:21:28 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kioclient/kioclient-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kiriki/kiriki-4.11.5.ebuild b/kde-base/kiriki/kiriki-4.11.5.ebuild
index 0737203fa198..31e754471179 100644
--- a/kde-base/kiriki/kiriki-4.11.5.ebuild
+++ b/kde-base/kiriki/kiriki-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiriki/kiriki-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kiriki/
 	http://games.kde.org/game.php?game=kiriki
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kiten/kiten-4.11.5.ebuild b/kde-base/kiten/kiten-4.11.5.ebuild
index 0c237a7aefac..4e5602dbabdf 100644
--- a/kde-base/kiten/kiten-4.11.5.ebuild
+++ b/kde-base/kiten/kiten-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.11.5.ebuild,v 1.1 2014/01/10 04:22:01 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-4.11.5.ebuild,v 1.2 2014/01/20 08:00:18 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="http://www.kde.org/applications/education/kiten http://edu.kde.org/kiten"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kjots/kjots-4.11.5.ebuild b/kde-base/kjots/kjots-4.11.5.ebuild
index 7465bafa8a92..586c7fd0926e 100644
--- a/kde-base/kjots/kjots-4.11.5.ebuild
+++ b/kde-base/kjots/kjots-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.11.5.ebuild,v 1.2 2014/01/20 08:00:55 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE note taking utility"
 HOMEPAGE="http://www.kde.org/applications/utilities/kjots/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild
index 0d489bf0f4d6..bfa94f6ca920 100644
--- a/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-4.11.5.ebuild,v 1.2 2014/01/20 08:00:10 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kjumpingcube/
 	http://games.kde.org/game.php?game=kjumpingcube
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kleopatra/kleopatra-4.11.5.ebuild b/kde-base/kleopatra/kleopatra-4.11.5.ebuild
index e96cc1fc4bd6..013dfb79f41c 100644
--- a/kde-base/kleopatra/kleopatra-4.11.5.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Kleopatra - KDE X.509 key manager"
 HOMEPAGE="http://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/klettres/klettres-4.11.5.ebuild b/kde-base/klettres/klettres-4.11.5.ebuild
index c9e25371e754..310836368c1d 100644
--- a/kde-base/klettres/klettres-4.11.5.ebuild
+++ b/kde-base/klettres/klettres-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
 HOMEPAGE="http://www.kde.org/applications/education/klettres
 http://edu.kde.org/klettres"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/klickety/klickety-4.11.5.ebuild b/kde-base/klickety/klickety-4.11.5.ebuild
index 0c063f7fc807..6ea5a8244e94 100644
--- a/kde-base/klickety/klickety-4.11.5.ebuild
+++ b/kde-base/klickety/klickety-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-4.11.5.ebuild,v 1.1 2014/01/10 04:22:02 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-4.11.5.ebuild,v 1.2 2014/01/20 08:00:45 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/klines/klines-4.11.5.ebuild b/kde-base/klines/klines-4.11.5.ebuild
index 4ad1b93bfe19..e7a71dabab0e 100644
--- a/kde-base/klines/klines-4.11.5.ebuild
+++ b/kde-base/klines/klines-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-4.11.5.ebuild,v 1.2 2014/01/20 08:00:26 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/klines/
 	http://games.kde.org/game.php?game=klines
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild b/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild
index 577effe3135d..f4b4938c981e 100644
--- a/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.11.5.ebuild,v 1.2 2014/01/20 08:00:28 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE web development - link validity checker"
 HOMEPAGE="http://www.kde.org/applications/development/klinkstatus/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-base/klipper/klipper-4.11.5.ebuild b/kde-base/klipper/klipper-4.11.5.ebuild
index df5f1c25dac6..dee6f2285908 100644
--- a/kde-base/klipper/klipper-4.11.5.ebuild
+++ b/kde-base/klipper/klipper-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Applet for KDE and X clipboard management"
 HOMEPAGE+=" http://userbase.kde.org/Klipper"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug prison"
 
 DEPEND="
diff --git a/kde-base/kmag/kmag-4.11.5.ebuild b/kde-base/kmag/kmag-4.11.5.ebuild
index 3dc58feb7da0..ffec6e59da91 100644
--- a/kde-base/kmag/kmag-4.11.5.ebuild
+++ b/kde-base/kmag/kmag-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="http://www.kde.org/applications/utilities/kmag/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild b/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild
index 44c8a4d95698..18536982ad72 100644
--- a/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kmahjongg/
 	http://games.kde.org/game.php?game=kmahjongg
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmail/kmail-4.11.5.ebuild b/kde-base/kmail/kmail-4.11.5.ebuild
index ec143061cb2c..e2c1e3169f7f 100644
--- a/kde-base/kmail/kmail-4.11.5.ebuild
+++ b/kde-base/kmail/kmail-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.11.5.ebuild,v 1.1 2014/01/10 04:21:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.11.5.ebuild,v 1.2 2014/01/20 08:00:15 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
 HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild
index f8d750df5a3e..19c1128dd2cf 100644
--- a/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.11.5.ebuild,v 1.2 2014/01/20 08:00:00 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild
index 1fc40368053a..8b3a4c24ec5d 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild,v 1.1 2014/01/10 04:21:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmimetypefinder/kmimetypefinder-4.11.5.ebuild,v 1.2 2014/01/20 08:00:31 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kmines/kmines-4.11.5.ebuild b/kde-base/kmines/kmines-4.11.5.ebuild
index 5ac42cf5fa0e..c48b8cf4fa13 100644
--- a/kde-base/kmines/kmines-4.11.5.ebuild
+++ b/kde-base/kmines/kmines-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.11.5.ebuild,v 1.1 2014/01/10 04:22:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kmines/
 	http://games.kde.org/game.php?game=kmines
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kmix/kmix-4.11.5.ebuild b/kde-base/kmix/kmix-4.11.5.ebuild
index afa625d69056..3305a0d9bc10 100644
--- a/kde-base/kmix/kmix-4.11.5.ebuild
+++ b/kde-base/kmix/kmix-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.11.5.ebuild,v 1.1 2014/01/10 04:21:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE mixer gui"
 HOMEPAGE="http://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug canberra pulseaudio"
 
 DEPEND="
diff --git a/kde-base/kmousetool/kmousetool-4.11.5.ebuild b/kde-base/kmousetool/kmousetool-4.11.5.ebuild
index cb1365a8a494..ab6013fa6908 100644
--- a/kde-base/kmousetool/kmousetool-4.11.5.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.11.5.ebuild,v 1.2 2014/01/20 08:00:37 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE program that clicks the mouse for you."
 HOMEPAGE="http://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kmouth/kmouth-4.11.5.ebuild b/kde-base/kmouth/kmouth-4.11.5.ebuild
index ab598bb4d0b8..01c93cb07d23 100644
--- a/kde-base/kmouth/kmouth-4.11.5.ebuild
+++ b/kde-base/kmouth/kmouth-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
 HOMEPAGE="http://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kmplot/kmplot-4.11.5.ebuild b/kde-base/kmplot/kmplot-4.11.5.ebuild
index 98c0a62f8eee..07d23693dc63 100644
--- a/kde-base/kmplot/kmplot-4.11.5.ebuild
+++ b/kde-base/kmplot/kmplot-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Mathematical function plotter for KDE"
 HOMEPAGE="http://www.kde.org/applications/education/kmplot http://edu.kde.org/kmplot"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild b/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild
index 642e398c5b7c..93d1e9e7bdfa 100644
--- a/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knavalbattle/knavalbattle-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/navalbattle/
 	http://games.kde.org/game.php?game=kbattleship
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/knetattach/knetattach-4.11.5.ebuild b/kde-base/knetattach/knetattach-4.11.5.ebuild
index 48311930d69a..2c3a429e511f 100644
--- a/kde-base/knetattach/knetattach-4.11.5.ebuild
+++ b/kde-base/knetattach/knetattach-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/knetwalk/knetwalk-4.11.5.ebuild b/kde-base/knetwalk/knetwalk-4.11.5.ebuild
index 397e3d88d8b7..042977b27266 100644
--- a/kde-base/knetwalk/knetwalk-4.11.5.ebuild
+++ b/kde-base/knetwalk/knetwalk-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.11.5.ebuild,v 1.1 2014/01/10 04:21:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetwalk/knetwalk-4.11.5.ebuild,v 1.2 2014/01/20 08:00:33 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/knetwalk/
 	http://games.kde.org/game.php?game=knetwalk
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/knewstuff/knewstuff-4.11.5.ebuild b/kde-base/knewstuff/knewstuff-4.11.5.ebuild
index 2e97b047e011..6e298758bbe0 100644
--- a/kde-base/knewstuff/knewstuff-4.11.5.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewstuff/knewstuff-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/knode/knode-4.11.5.ebuild b/kde-base/knode/knode-4.11.5.ebuild
index ee2fbabf2c30..78b7499fdda7 100644
--- a/kde-base/knode/knode-4.11.5.ebuild
+++ b/kde-base/knode/knode-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A newsreader for KDE"
 HOMEPAGE="http://www.kde.org/applications/internet/knode/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96
diff --git a/kde-base/knotes/knotes-4.11.5.ebuild b/kde-base/knotes/knotes-4.11.5.ebuild
index 840b4f27c370..a61d79e220d5 100644
--- a/kde-base/knotes/knotes-4.11.5.ebuild
+++ b/kde-base/knotes/knotes-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.11.5.ebuild,v 1.1 2014/01/10 04:21:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.11.5.ebuild,v 1.2 2014/01/20 08:00:09 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Notes application"
 HOMEPAGE="http://www.kde.org/applications/utilities/knotes/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/knotify/knotify-4.11.5.ebuild b/kde-base/knotify/knotify-4.11.5.ebuild
index 6de5b815d8b8..26d7f7e65771 100644
--- a/kde-base/knotify/knotify-4.11.5.ebuild
+++ b/kde-base/knotify/knotify-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kolf/kolf-4.11.5.ebuild b/kde-base/kolf/kolf-4.11.5.ebuild
index 7d8ebada4231..693cc43d54e7 100644
--- a/kde-base/kolf/kolf-4.11.5.ebuild
+++ b/kde-base/kolf/kolf-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-4.11.5.ebuild,v 1.2 2014/01/20 08:00:01 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kolf/
 	http://games.kde.org/game.php?game=kolf
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kollision/kollision-4.11.5.ebuild b/kde-base/kollision/kollision-4.11.5.ebuild
index f1610b821c5e..71dd5e75aca0 100644
--- a/kde-base/kollision/kollision-4.11.5.ebuild
+++ b/kde-base/kollision/kollision-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kollision/kollision-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kollision/
 	http://games.kde.org/game.php?game=kollision
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild b/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild
index ee7af4db7368..54e76da625d7 100644
--- a/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild,v 1.1 2014/01/10 04:21:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Paint Program for KDE"
 HOMEPAGE="http://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD LGPL-2"
 IUSE="debug"
 
diff --git a/kde-base/kommander/kommander-4.11.5.ebuild b/kde-base/kommander/kommander-4.11.5.ebuild
index d8c256ee0a2c..c6ddf335dda3 100644
--- a/kde-base/kommander/kommander-4.11.5.ebuild
+++ b/kde-base/kommander/kommander-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.11.5.ebuild,v 1.1 2014/01/10 04:21:55 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -11,5 +11,5 @@ inherit kde4-meta
 
 DESCRIPTION="KDE dialog system for scripting"
 HOMEPAGE="http://www.kde.org/applications/development/kommander/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kompare/kompare-4.11.5.ebuild b/kde-base/kompare/kompare-4.11.5.ebuild
index 5309731b30d4..5df76325d0a3 100644
--- a/kde-base/kompare/kompare-4.11.5.ebuild
+++ b/kde-base/kompare/kompare-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.11.5.ebuild,v 1.1 2014/01/10 04:21:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.11.5.ebuild,v 1.2 2014/01/20 08:00:23 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="Kompare is a program to view the differences between files."
 HOMEPAGE="http://www.kde.org/applications/development/kompare
 http://www.caffeinated.me.uk/kompare"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kompare/kompare-4.12.1.ebuild b/kde-base/kompare/kompare-4.12.1.ebuild
index a7c3edb0407a..aa923ab128f1 100644
--- a/kde-base/kompare/kompare-4.12.1.ebuild
+++ b/kde-base/kompare/kompare-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.12.1.ebuild,v 1.1 2014/01/18 11:24:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.12.1.ebuild,v 1.3 2014/01/19 11:02:57 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="Kompare is a program to view the differences between files."
 HOMEPAGE="http://www.kde.org/applications/development/kompare
 http://www.caffeinated.me.uk/kompare"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkomparediff2)"
diff --git a/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild b/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild
index caf67e5e2645..af86dc456c9d 100644
--- a/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild,v 1.1 2014/01/10 04:21:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-4.11.5.ebuild,v 1.2 2014/01/20 08:00:14 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-base/konqueror/konqueror-4.11.5.ebuild b/kde-base/konqueror/konqueror-4.11.5.ebuild
index 9979db09f315..c3dbc0fbd595 100644
--- a/kde-base/konqueror/konqueror-4.11.5.ebuild
+++ b/kde-base/konqueror/konqueror-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.11.5.ebuild,v 1.1 2014/01/10 04:21:45 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/internet/konqueror/
 	http://konqueror.org/
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bookmarks debug svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
diff --git a/kde-base/konquest/konquest-4.11.5.ebuild b/kde-base/konquest/konquest-4.11.5.ebuild
index a6ef2dd1f422..577489d49b3f 100644
--- a/kde-base/konquest/konquest-4.11.5.ebuild
+++ b/kde-base/konquest/konquest-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.11.5.ebuild,v 1.1 2014/01/10 04:22:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/konquest/
 	http://games.kde.org/game.php?game=konquest
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/konsole/konsole-4.11.5.ebuild b/kde-base/konsole/konsole-4.11.5.ebuild
index efca2420a71f..c41df4546726 100644
--- a/kde-base/konsole/konsole-4.11.5.ebuild
+++ b/kde-base/konsole/konsole-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.11.5.ebuild,v 1.1 2014/01/10 04:21:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.11.5.ebuild,v 1.2 2014/01/20 08:00:27 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-base
 
 DESCRIPTION="X terminal for use with KDE"
 HOMEPAGE="http://www.kde.org/applications/system/konsole http://konsole.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 COMMONDEPEND="
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild
index a70ce9363272..7e55280fd5ec 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.11.5.ebuild,v 1.2 2014/01/20 08:00:12 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="A command line interface to KDE calendars"
 HOMEPAGE+=" http://userbase.kde.org/KonsoleKalendar"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kontact/kontact-4.11.5.ebuild b/kde-base/kontact/kontact-4.11.5.ebuild
index 1c708a3a4290..4fb86446f7b5 100644
--- a/kde-base/kontact/kontact-4.11.5.ebuild
+++ b/kde-base/kontact/kontact-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.11.5.ebuild,v 1.1 2014/01/10 04:21:45 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.11.5.ebuild,v 1.2 2014/01/20 08:00:07 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE personal information manager"
 HOMEPAGE="http://www.kde.org/applications/office/kontact/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kopete/kopete-4.11.5.ebuild b/kde-base/kopete/kopete-4.11.5.ebuild
index 126486c96a70..97bc5e5e89a8 100644
--- a/kde-base/kopete/kopete-4.11.5.ebuild
+++ b/kde-base/kopete/kopete-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.11.5.ebuild,v 1.1 2014/01/10 04:22:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.11.5.ebuild,v 1.2 2014/01/20 08:00:06 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-base/korganizer/korganizer-4.11.5.ebuild b/kde-base/korganizer/korganizer-4.11.5.ebuild
index b00ddd060a1d..8191351349c4 100644
--- a/kde-base/korganizer/korganizer-4.11.5.ebuild
+++ b/kde-base/korganizer/korganizer-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="A Personal Organizer for KDE"
 HOMEPAGE="http://www.kde.org/applications/office/korganizer/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/korundum/korundum-4.11.5.ebuild b/kde-base/korundum/korundum-4.11.5.ebuild
index 12d4a60f2ec9..f75f181966a2 100644
--- a/kde-base/korundum/korundum-4.11.5.ebuild
+++ b/kde-base/korundum/korundum-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-4.11.5.ebuild,v 1.2 2014/01/20 08:00:04 kensington Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ USE_RUBY="ruby19"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug kate okular"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
 
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild
index a0e0832683de..1f9bf47219f3 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-base/kpat/kpat-4.11.5.ebuild b/kde-base/kpat/kpat-4.11.5.ebuild
index 2f09f33f39e2..dbc861d7c81b 100644
--- a/kde-base/kpat/kpat-4.11.5.ebuild
+++ b/kde-base/kpat/kpat-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE patience game"
 HOMEPAGE="http://games.kde.org/game.php?game=kpat"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kppp/kppp-4.11.5.ebuild b/kde-base/kppp/kppp-4.11.5.ebuild
index 21ef8c71d65c..a53a931e1ee7 100644
--- a/kde-base/kppp/kppp-4.11.5.ebuild
+++ b/kde-base/kppp/kppp-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.11.5.ebuild,v 1.1 2014/01/10 04:21:33 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: A dialer and front-end to pppd."
 HOMEPAGE="http://www.kde.org/applications/internet/kppp"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kquitapp/kquitapp-4.11.5.ebuild b/kde-base/kquitapp/kquitapp-4.11.5.ebuild
index d260750ba507..853c1c211fee 100644
--- a/kde-base/kquitapp/kquitapp-4.11.5.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kquitapp/kquitapp-4.11.5.ebuild,v 1.2 2014/01/20 08:00:23 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/krdc/krdc-4.11.5.ebuild b/kde-base/krdc/krdc-4.11.5.ebuild
index 0ce3d31b3705..9f06c2cd0802 100644
--- a/kde-base/krdc/krdc-4.11.5.ebuild
+++ b/kde-base/krdc/krdc-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 HOMEPAGE="http://www.kde.org/applications/internet/krdc/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug jpeg rdesktop vnc zeroconf telepathy"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
diff --git a/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild b/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild
index b0afac7f58c8..0c9852e8e4cb 100644
--- a/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-4.11.5.ebuild,v 1.2 2014/01/20 08:00:21 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild
index 6b1b32fd79ed..8eeabf7cad1b 100644
--- a/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild,v 1.1 2014/01/10 04:21:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kremotecontrol/kremotecontrol-4.11.5.ebuild,v 1.2 2014/01/20 08:00:10 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
 HOMEPAGE="http://www.kde.org/applications/utilities/kremotecontrol
 http://utils.kde.org/projects/kremotecontrol"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kreversi/kreversi-4.11.5.ebuild b/kde-base/kreversi/kreversi-4.11.5.ebuild
index 6659b5e88cfb..6a7564183f75 100644
--- a/kde-base/kreversi/kreversi-4.11.5.ebuild
+++ b/kde-base/kreversi/kreversi-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.11.5.ebuild,v 1.1 2014/01/10 04:22:03 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-4.11.5.ebuild,v 1.2 2014/01/20 08:00:04 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kreversi/
 	http://games.kde.org/game.php?game=kreversi
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/krfb/krfb-4.11.5.ebuild b/kde-base/krfb/krfb-4.11.5.ebuild
index 90a456ca3419..0e802d5ee31b 100644
--- a/kde-base/krfb/krfb-4.11.5.ebuild
+++ b/kde-base/krfb/krfb-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
 HOMEPAGE="http://www.kde.org/applications/system/krfb/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug telepathy"
 
 DEPEND="
diff --git a/kde-base/krossjava/krossjava-4.11.5.ebuild b/kde-base/krossjava/krossjava-4.11.5.ebuild
index fb7b574b8d0c..5c03c36419eb 100644
--- a/kde-base/krossjava/krossjava-4.11.5.ebuild
+++ b/kde-base/krossjava/krossjava-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="java"
 inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/krosspython/krosspython-4.11.5.ebuild b/kde-base/krosspython/krosspython-4.11.5.ebuild
index fd17b04de7e5..9ac1ac10424d 100644
--- a/kde-base/krosspython/krosspython-4.11.5.ebuild
+++ b/kde-base/krosspython/krosspython-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-single-r1 kde4-meta
 
 DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-base/krossruby/krossruby-4.11.5.ebuild b/kde-base/krossruby/krossruby-4.11.5.ebuild
index ca3cc27f6c67..748f2b4dfa92 100644
--- a/kde-base/krossruby/krossruby-4.11.5.ebuild
+++ b/kde-base/krossruby/krossruby-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.11.5.ebuild,v 1.2 2014/01/20 08:00:32 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ USE_RUBY="ruby19"
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""
diff --git a/kde-base/kruler/kruler-4.11.5.ebuild b/kde-base/kruler/kruler-4.11.5.ebuild
index 84761007b076..a2cdffff4fe3 100644
--- a/kde-base/kruler/kruler-4.11.5.ebuild
+++ b/kde-base/kruler/kruler-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-4.11.5.ebuild,v 1.2 2014/01/20 08:00:30 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="A screen ruler for KDE"
 HOMEPAGE="http://www.kde.org/applications/graphics/kruler/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/krunner/krunner-4.11.5.ebuild b/kde-base/krunner/krunner-4.11.5.ebuild
index fbd56a18f76b..6fa9d864d209 100644
--- a/kde-base/krunner/krunner-4.11.5.ebuild
+++ b/kde-base/krunner/krunner-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.11.5.ebuild,v 1.1 2014/01/10 04:22:03 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="KDE Command Runner"
 HOMEPAGE+=" http://userbase.kde.org/Plasma/Krunner"
 IUSE="debug"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kcheckpass)
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild
index 811cef16830d..52d514e5a96b 100644
--- a/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ksaneplugin-4.11.5.ebuild,v 1.2 2014/01/20 08:00:30 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="SANE Plugin for KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kscd/kscd-4.11.5.ebuild b/kde-base/kscd/kscd-4.11.5.ebuild
index a44b4df53ec0..641d5bf21be1 100644
--- a/kde-base/kscd/kscd-4.11.5.ebuild
+++ b/kde-base/kscd/kscd-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.11.5.ebuild,v 1.1 2014/01/10 04:22:01 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE CD player"
 HOMEPAGE="http://www.kde.org/applications/multimedia/kscd/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild
index 2b18f59b1f49..dd69dacbd795 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild,v 1.1 2014/01/10 04:21:34 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.11.5.ebuild,v 1.2 2014/01/20 08:00:04 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kshisen/kshisen-4.11.5.ebuild b/kde-base/kshisen/kshisen-4.11.5.ebuild
index 1cf56534c9a5..27a3af517fe9 100644
--- a/kde-base/kshisen/kshisen-4.11.5.ebuild
+++ b/kde-base/kshisen/kshisen-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.11.5.ebuild,v 1.1 2014/01/10 04:21:31 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.11.5.ebuild,v 1.2 2014/01/20 08:00:42 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kshisen/
 	http://games.kde.org/game.php?game=kshisen
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksirk/ksirk-4.11.5.ebuild b/kde-base/ksirk/ksirk-4.11.5.ebuild
index e8ac1503bf72..4df7a66585a2 100644
--- a/kde-base/ksirk/ksirk-4.11.5.ebuild
+++ b/kde-base/ksirk/ksirk-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.11.5.ebuild,v 1.2 2014/01/20 08:00:40 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/ksirk/
 	http://games.kde.org/game.php?game=ksirk
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksmserver/ksmserver-4.11.5.ebuild b/kde-base/ksmserver/ksmserver-4.11.5.ebuild
index 6e46e2b0124e..9ede55bcfe31 100644
--- a/kde-base/ksmserver/ksmserver-4.11.5.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.11.5.ebuild,v 1.2 2014/01/20 08:00:03 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild b/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild
index b8497fee1856..ee25d5129305 100644
--- a/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild
+++ b/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild,v 1.1 2014/01/10 04:21:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnakeduel/ksnakeduel-4.11.5.ebuild,v 1.2 2014/01/20 08:00:15 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Tron game"
 HOMEPAGE="http://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild b/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild
index 805b0978d458..cc71cb74b7ba 100644
--- a/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild,v 1.1 2014/01/10 04:21:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-4.11.5.ebuild,v 1.2 2014/01/20 08:00:10 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Screenshot Utility"
 HOMEPAGE="http://www.kde.org/applications/graphics/ksnapshot/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi"
 
 DEPEND="
diff --git a/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild b/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild
index f15e4102a2dd..ae6da9eb4e5b 100644
--- a/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild,v 1.1 2014/01/10 04:21:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/kspaceduel/
 	http://games.kde.org/game.php?game=kspaceduel
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/ksplash/ksplash-4.11.5.ebuild b/kde-base/ksplash/ksplash-4.11.5.ebuild
index 62af040a99dd..458f181715e6 100644
--- a/kde-base/ksplash/ksplash-4.11.5.ebuild
+++ b/kde-base/ksplash/ksplash-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.11.5.ebuild,v 1.1 2014/01/10 04:21:32 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.11.5.ebuild,v 1.2 2014/01/20 08:00:51 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="3dnow altivec debug mmx sse sse2 xinerama"
 
 COMMONDEPEND="
diff --git a/kde-base/ksquares/ksquares-4.11.5.ebuild b/kde-base/ksquares/ksquares-4.11.5.ebuild
index 4dc098ebaa58..ea13155834fa 100644
--- a/kde-base/ksquares/ksquares-4.11.5.ebuild
+++ b/kde-base/ksquares/ksquares-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.11.5.ebuild,v 1.1 2014/01/10 04:21:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksquares/ksquares-4.11.5.ebuild,v 1.2 2014/01/20 08:00:40 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/ksquares/
 	http://games.kde.org/game.php?game=ksquares
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kstars/kstars-4.11.5.ebuild b/kde-base/kstars/kstars-4.11.5.ebuild
index 70d8b6c4799c..b3fe12585b54 100644
--- a/kde-base/kstars/kstars-4.11.5.ebuild
+++ b/kde-base/kstars/kstars-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit flag-o-matic kde4-base
 
 DESCRIPTION="KDE Desktop Planetarium"
 HOMEPAGE="http://www.kde.org/applications/education/kstars http://edu.kde.org/kstars"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug fits indi"
 
 DEPEND="
diff --git a/kde-base/kstart/kstart-4.11.5.ebuild b/kde-base/kstart/kstart-4.11.5.ebuild
index 965a2bd6a87c..683b093702a2 100644
--- a/kde-base/kstart/kstart-4.11.5.ebuild
+++ b/kde-base/kstart/kstart-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-4.11.5.ebuild,v 1.2 2014/01/20 08:00:26 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kstartperf/Manifest b/kde-base/kstartperf/Manifest
deleted file mode 100644
index 304d1fdc63a5..000000000000
--- a/kde-base/kstartperf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdesdk-4.10.5.tar.xz 5261616 SHA256 e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 SHA512 2b80d55bba915a443c8c4e7314b850127bdd02fd82fe7c4513064cfade9a7bf486af60b6be1d0d2836c11ceb12d81f8e37f8ef0aabe44fbd99869e7be00dd29b WHIRLPOOL 120e346dede35838785f62eca49daa52fdb73d6e3f4b94ee058bd1c443402037f220a762e7dd92895def4be238b6a65d0dfe0724b9b38f678669db0a1feaffdd
diff --git a/kde-base/kstartperf/kstartperf-4.10.5.ebuild b/kde-base/kstartperf/kstartperf-4.10.5.ebuild
deleted file mode 100644
index a7e6aa315373..000000000000
--- a/kde-base/kstartperf/kstartperf-4.10.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.10.5.ebuild,v 1.5 2013/08/02 14:29:53 ago Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kde-dev-utils"
-else
-	KMNAME="kdesdk"
-	KMMODULE="kde-dev-utils/${PN}"
-fi
-inherit kde4-meta
-
-DESCRIPTION="Measures starting performance of applications"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild
index 49519b1fcfed..7f2e86df42bb 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartupconfig/kstartupconfig-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kstyles/kstyles-4.11.5.ebuild b/kde-base/kstyles/kstyles-4.11.5.ebuild
index c03fc0e15cf4..41c5e6fafdc7 100644
--- a/kde-base/kstyles/kstyles-4.11.5.ebuild
+++ b/kde-base/kstyles/kstyles-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstyles/kstyles-4.11.5.ebuild,v 1.2 2014/01/20 08:00:29 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A set of different KDE styles."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksudoku/ksudoku-4.11.5.ebuild b/kde-base/ksudoku/ksudoku-4.11.5.ebuild
index c8677cbfa850..681d46ecb125 100644
--- a/kde-base/ksudoku/ksudoku-4.11.5.ebuild
+++ b/kde-base/ksudoku/ksudoku-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.11.5.ebuild,v 1.1 2014/01/10 04:21:48 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/ksudoku/
 	http://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/ksysguard/ksysguard-4.11.5.ebuild b/kde-base/ksysguard/ksysguard-4.11.5.ebuild
index 7717fa5109ff..8f55cfbd7b4d 100644
--- a/kde-base/ksysguard/ksysguard-4.11.5.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.11.5.ebuild,v 1.1 2014/01/10 04:21:25 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.11.5.ebuild,v 1.2 2014/01/20 08:00:13 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit kde4-meta
 
 DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
 HOMEPAGE+=" http://userbase.kde.org/KSysGuard"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug lm_sensors test"
 
 DEPEND="
diff --git a/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild b/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild
index efc1bff30ded..235a003c1805 100644
--- a/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild,v 1.1 2014/01/10 04:21:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE system log viewer"
 HOMEPAGE="http://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 RESTRICT=test
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild
index df50a1c7ac0c..bc9d3cebf887 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild,v 1.1 2014/01/10 04:21:39 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-4.11.5.ebuild,v 1.2 2014/01/20 08:00:14 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="x11-libs/libX11"
diff --git a/kde-base/kteatime/kteatime-4.11.5.ebuild b/kde-base/kteatime/kteatime-4.11.5.ebuild
index c1e1803a649b..f116a4ee8255 100644
--- a/kde-base/kteatime/kteatime-4.11.5.ebuild
+++ b/kde-base/kteatime/kteatime-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.11.5.ebuild,v 1.1 2014/01/10 04:22:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE timer for making a fine cup of tea"
 HOMEPAGE="http://www.kde.org/applications/games/kteatime"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktimer/ktimer-4.11.5.ebuild b/kde-base/ktimer/ktimer-4.11.5.ebuild
index dfbb2bb59ffd..8204a7ac3cb0 100644
--- a/kde-base/ktimer/ktimer-4.11.5.ebuild
+++ b/kde-base/ktimer/ktimer-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.11.5.ebuild,v 1.1 2014/01/10 04:22:08 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-4.11.5.ebuild,v 1.2 2014/01/20 08:00:23 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE Timer"
 HOMEPAGE="http://www.kde.org/applications/utilities/ktimer
 http://utils.kde.org/projects/ktimer"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild b/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild
index 22664d8d7b40..69b40c3bb49b 100644
--- a/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.11.5.ebuild,v 1.2 2014/01/20 08:00:14 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KTimeTracker tracks time spent on various tasks."
 HOEMPAGE="http://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild b/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild
index d7a6eabf5200..98ca92e6c148 100644
--- a/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild,v 1.1 2014/01/10 04:22:02 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimezoned/ktimezoned-4.11.5.ebuild,v 1.2 2014/01/20 08:00:39 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/ktnef/ktnef-4.11.5.ebuild b/kde-base/ktnef/ktnef-4.11.5.ebuild
index 628083d279d5..aa06f4461e41 100644
--- a/kde-base/ktnef/ktnef-4.11.5.ebuild
+++ b/kde-base/ktnef/ktnef-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="A viewer for TNEF attachments."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="debug"
 
diff --git a/kde-base/ktnef/ktnef-4.12.1.ebuild b/kde-base/ktnef/ktnef-4.12.1.ebuild
index 487925a12a59..e1c19f202a76 100644
--- a/kde-base/ktnef/ktnef-4.12.1.ebuild
+++ b/kde-base/ktnef/ktnef-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-4.12.1.ebuild,v 1.1 2014/01/18 11:23:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-4.12.1.ebuild,v 1.2 2014/01/19 10:59:01 ago Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="A viewer for TNEF attachments."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="debug"
 
diff --git a/kde-base/ktouch/ktouch-4.11.5.ebuild b/kde-base/ktouch/ktouch-4.11.5.ebuild
index 5d412f8f927d..2ccdfdd0f930 100644
--- a/kde-base/ktouch/ktouch-4.11.5.ebuild
+++ b/kde-base/ktouch/ktouch-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.11.5.ebuild,v 1.2 2014/01/20 08:00:31 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 HOMEPAGE="http://edu.kde.org/applications/miscellaneous/ktouch"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild b/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild
index f335f378e64d..ca569b336726 100644
--- a/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktraderclient/ktraderclient-4.11.5.ebuild,v 1.2 2014/01/20 08:00:38 kensington Exp $
 
 EAPI=5
 
@@ -9,4 +9,4 @@ inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"
 IUSE="debug"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
diff --git a/kde-base/ktuberling/ktuberling-4.11.5.ebuild b/kde-base/ktuberling/ktuberling-4.11.5.ebuild
index c3262bae6177..473b4312f4e4 100644
--- a/kde-base/ktuberling/ktuberling-4.11.5.ebuild
+++ b/kde-base/ktuberling/ktuberling-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.11.5.ebuild,v 1.1 2014/01/10 04:21:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/ktuberling/
 	http://games.kde.org/game.php?game=ktuberling
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/kturtle/kturtle-4.11.5.ebuild b/kde-base/kturtle/kturtle-4.11.5.ebuild
index 4f4d02cb7215..e30b31ac79f9 100644
--- a/kde-base/kturtle/kturtle-4.11.5.ebuild
+++ b/kde-base/kturtle/kturtle-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.11.5.ebuild,v 1.1 2014/01/10 04:21:54 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.11.5.ebuild,v 1.2 2014/01/20 08:00:10 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
 HOMEPAGE="http://www.kde.org/applications/education/kturtle http://edu.kde.org/kturtle"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/ktux/ktux-4.11.5.ebuild b/kde-base/ktux/ktux-4.11.5.ebuild
index f5ec9c607b90..e4d275aae2ce 100644
--- a/kde-base/ktux/ktux-4.11.5.ebuild
+++ b/kde-base/ktux/ktux-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.11.5.ebuild,v 1.1 2014/01/10 04:22:20 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.11.5.ebuild,v 1.2 2014/01/20 08:00:12 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
 HOMEPAGE+=" http://userbase.kde.org/KTux"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-base/kubrick/kubrick-4.11.5.ebuild b/kde-base/kubrick/kubrick-4.11.5.ebuild
index 2bf4339ee8d7..db22ec3d5ece 100644
--- a/kde-base/kubrick/kubrick-4.11.5.ebuild
+++ b/kde-base/kubrick/kubrick-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.11.5.ebuild,v 1.1 2014/01/10 04:22:17 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kubrick/kubrick-4.11.5.ebuild,v 1.2 2014/01/20 08:00:45 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle."
 HOMEPAGE="http://www.kde.org/applications/games/kubrick/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="$(add_kdebase_dep libkdegames)
diff --git a/kde-base/kuiserver/kuiserver-4.11.5.ebuild b/kde-base/kuiserver/kuiserver-4.11.5.ebuild
index 0e2b75464077..09f3f40c44be 100644
--- a/kde-base/kuiserver/kuiserver-4.11.5.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiserver/kuiserver-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kuiviewer/Manifest b/kde-base/kuiviewer/Manifest
deleted file mode 100644
index 304d1fdc63a5..000000000000
--- a/kde-base/kuiviewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdesdk-4.10.5.tar.xz 5261616 SHA256 e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 SHA512 2b80d55bba915a443c8c4e7314b850127bdd02fd82fe7c4513064cfade9a7bf486af60b6be1d0d2836c11ceb12d81f8e37f8ef0aabe44fbd99869e7be00dd29b WHIRLPOOL 120e346dede35838785f62eca49daa52fdb73d6e3f4b94ee058bd1c443402037f220a762e7dd92895def4be238b6a65d0dfe0724b9b38f678669db0a1feaffdd
diff --git a/kde-base/kuiviewer/kuiviewer-4.10.5.ebuild b/kde-base/kuiviewer/kuiviewer-4.10.5.ebuild
deleted file mode 100644
index 7e753195fe1f..000000000000
--- a/kde-base/kuiviewer/kuiviewer-4.10.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.10.5.ebuild,v 1.6 2013/08/29 15:49:18 kensington Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kde-dev-utils"
-else
-	KMNAME="kdesdk"
-	KMMODULE="kde-dev-utils/${PN}"
-fi
-inherit kde4-meta
-
-DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
-HOMEPAGE="http://www.kde.org/applications/development/kuiviewer/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild
index e536e0527f47..150a52d72343 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild,v 1.1 2014/01/10 04:21:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kurifilter-plugins/kurifilter-plugins-4.11.5.ebuild,v 1.2 2014/01/20 08:00:37 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT=test
diff --git a/kde-base/kuser/kuser-4.11.5.ebuild b/kde-base/kuser/kuser-4.11.5.ebuild
index cb72da5274bb..3bc355875fad 100644
--- a/kde-base/kuser/kuser-4.11.5.ebuild
+++ b/kde-base/kuser/kuser-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.11.5.ebuild,v 1.1 2014/01/10 04:21:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.11.5.ebuild,v 1.2 2014/01/20 08:00:20 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE application that helps you manage system users"
 HOMEPAGE="http://www.kde.org/applications/system/kuser/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kwallet/kwallet-4.11.5.ebuild b/kde-base/kwallet/kwallet-4.11.5.ebuild
index b692e88515de..79e6ffa2337d 100644
--- a/kde-base/kwallet/kwallet-4.11.5.ebuild
+++ b/kde-base/kwallet/kwallet-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.11.5.ebuild,v 1.1 2014/01/10 04:21:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE Wallet Management Tool"
 HOMEAGE="http://www.kde.org/applications/system/kwalletmanager
 http://utils.kde.org/projects/kwalletmanager"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kwalletd/kwalletd-4.11.5.ebuild b/kde-base/kwalletd/kwalletd-4.11.5.ebuild
index 24f1afceccde..d30f5a80989e 100644
--- a/kde-base/kwalletd/kwalletd-4.11.5.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.11.5.ebuild,v 1.1 2014/01/10 04:21:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.11.5.ebuild,v 1.2 2014/01/20 08:00:53 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kwin/kwin-4.11.5.ebuild b/kde-base/kwin/kwin-4.11.5.ebuild
index 490aad6658a9..6737ef9cc675 100644
--- a/kde-base/kwin/kwin-4.11.5.ebuild
+++ b/kde-base/kwin/kwin-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.11.5.ebuild,v 1.2 2014/01/20 08:00:30 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE window manager"
 HOMEPAGE+=" http://userbase.kde.org/KWin"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gles opengl wayland"
 
 COMMONDEPEND="
diff --git a/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild b/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild
index 6b0febee694a..591301aba73a 100644
--- a/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild,v 1.1 2014/01/10 04:21:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
 HOMEPAGE="http://www.kde.org/applications/education/kwordquiz
 http://edu.kde.org/kwordquiz"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/kwrite/kwrite-4.11.5.ebuild b/kde-base/kwrite/kwrite-4.11.5.ebuild
index b415874f32cf..3c17c84885dd 100644
--- a/kde-base/kwrite/kwrite-4.11.5.ebuild
+++ b/kde-base/kwrite/kwrite-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.11.5.ebuild,v 1.1 2014/01/10 04:21:44 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.11.5.ebuild,v 1.2 2014/01/20 08:00:08 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE MDI editor/IDE"
 HOMEPAGE="http://www.kde.org/applications/utilities/kwrite"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/kwrited/kwrited-4.11.5.ebuild b/kde-base/kwrited/kwrited-4.11.5.ebuild
index 1c03080fc90e..fe1033918b01 100644
--- a/kde-base/kwrited/kwrited-4.11.5.ebuild
+++ b/kde-base/kwrited/kwrited-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.11.5.ebuild,v 1.1 2014/01/10 04:21:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.11.5.ebuild,v 1.2 2014/01/20 08:00:33 kensington Exp $
 
 EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE daemon listening for wall and write messages."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkcddb/libkcddb-4.11.5.ebuild b/kde-base/libkcddb/libkcddb-4.11.5.ebuild
index 85584491ca11..19e908827c28 100644
--- a/kde-base/libkcddb/libkcddb-4.11.5.ebuild
+++ b/kde-base/libkcddb/libkcddb-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.11.5.ebuild,v 1.1 2014/01/10 04:21:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.11.5.ebuild,v 1.2 2014/01/20 08:00:16 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild
index 309d0c1b8532..c21870fd678e 100644
--- a/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcompactdisc/libkcompactdisc-4.11.5.ebuild,v 1.2 2014/01/20 08:00:43 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug"
 
 src_configure() {
diff --git a/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild b/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild
index d12ee11173e1..b9e3d2e3d790 100644
--- a/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.11.5.ebuild,v 1.2 2014/01/20 08:00:21 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera raw image library wrapper"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild b/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild
index 57d297663263..00f1dbe403f2 100644
--- a/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild,v 1.1 2014/01/10 04:22:04 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-4.11.5.ebuild,v 1.2 2014/01/20 08:00:05 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
diff --git a/kde-base/libkdegames/libkdegames-4.11.5.ebuild b/kde-base/libkdegames/libkdegames-4.11.5.ebuild
index f5c6efb66ffa..4e04fe307af2 100644
--- a/kde-base/libkdegames/libkdegames-4.11.5.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.11.5.ebuild,v 1.2 2014/01/20 08:00:47 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Base library common to many KDE games."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug openal"
 
 DEPEND="
diff --git a/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild b/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild
index 240ad3a80fec..32fd50e4e985 100644
--- a/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkexiv2/libkexiv2-4.11.5.ebuild,v 1.2 2014/01/20 08:00:17 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +xmp"
 
 DEPEND="
diff --git a/kde-base/libkipi/libkipi-4.11.5.ebuild b/kde-base/libkipi/libkipi-4.11.5.ebuild
index e14e5f9f0495..d8e8187cc17f 100644
--- a/kde-base/libkipi/libkipi-4.11.5.ebuild
+++ b/kde-base/libkipi/libkipi-4.11.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A library for image plugins accross KDE applications."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild
index 08837d82974d..56bb410e7768 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.11.5.ebuild,v 1.2 2014/01/20 08:00:03 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild b/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild
index 3a3309c865d7..6ec2d83f1d95 100644
--- a/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild
+++ b/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild,v 1.1 2014/01/18 11:23:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkomparediff2/libkomparediff2-4.12.1.ebuild,v 1.3 2014/01/19 11:02:50 ago Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/libkonq/libkonq-4.11.5.ebuild b/kde-base/libkonq/libkonq-4.11.5.ebuild
index 715d3baaa75d..031f2723607d 100644
--- a/kde-base/libkonq/libkonq-4.11.5.ebuild
+++ b/kde-base/libkonq/libkonq-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.11.5.ebuild,v 1.1 2014/01/10 04:21:28 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.11.5.ebuild,v 1.2 2014/01/20 08:00:40 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 RESTRICT="test"
 
diff --git a/kde-base/libksane/libksane-4.11.5.ebuild b/kde-base/libksane/libksane-4.11.5.ebuild
index e79c41ef663d..5b08bc07cedb 100644
--- a/kde-base/libksane/libksane-4.11.5.ebuild
+++ b/kde-base/libksane/libksane-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.11.5.ebuild,v 1.1 2014/01/10 04:22:00 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.11.5.ebuild,v 1.2 2014/01/20 08:00:12 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 LICENSE="LGPL-2"
 
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild
index f3c583d85feb..72269b1da75c 100644
--- a/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild,v 1.1 2014/01/10 04:22:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.11.5.ebuild,v 1.2 2014/01/20 08:00:46 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="libs/kworkspace"
 inherit kde4-meta
 
 DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild
index 8fb72a8a87f0..faa292c396c9 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild,v 1.1 2014/01/10 04:22:01 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.11.5.ebuild,v 1.2 2014/01/20 08:00:26 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="libs/oxygen"
 inherit kde4-meta
 
 DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="x11-libs/libX11"
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild
index f402c6168c49..73a3108e097a 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild,v 1.1 2014/01/10 04:21:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.11.5.ebuild,v 1.2 2014/01/20 08:00:02 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="libs/plasmaclock"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop"
 
 DEPEND="
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild
index 0a5630a8ffa4..807046fff510 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 DEPEND="
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild
index c4ec983b0f81..6dfcf7f548a8 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libtaskmanager/libtaskmanager-4.11.5.ebuild,v 1.2 2014/01/20 08:00:41 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="libs/taskmanager"
 inherit kde4-meta
 
 DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/lokalize/lokalize-4.11.5.ebuild b/kde-base/lokalize/lokalize-4.11.5.ebuild
index 742be3e3f309..86862e6dbd9f 100644
--- a/kde-base/lokalize/lokalize-4.11.5.ebuild
+++ b/kde-base/lokalize/lokalize-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.11.5.ebuild,v 1.1 2014/01/10 04:22:19 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.11.5.ebuild,v 1.2 2014/01/20 08:00:19 kensington Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit python-single-r1 kde4-base
 DESCRIPTION="KDE4 translation tool"
 HOMEPAGE="http://www.kde.org/applications/development/lokalize
 http://l10n.kde.org/tools"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-base/lskat/lskat-4.11.5.ebuild b/kde-base/lskat/lskat-4.11.5.ebuild
index e5a34d85bc49..1106660959ec 100644
--- a/kde-base/lskat/lskat-4.11.5.ebuild
+++ b/kde-base/lskat/lskat-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/games/lskat/
 	http://games.kde.org/game.php?game=lskat
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/marble/marble-4.11.5.ebuild b/kde-base/marble/marble-4.11.5.ebuild
index 2e5e0fb17d9b..e5dd38cc7efb 100644
--- a/kde-base/marble/marble-4.11.5.ebuild
+++ b/kde-base/marble/marble-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit kde4-base python-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
 # tests fail / segfault. Last checked for 4.9.0
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild
index f8cceb5543ed..8270b498ebee 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild,v 1.1 2014/01/10 04:21:31 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mplayerthumbs/mplayerthumbs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:09 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild
index bb7258a2f1ef..182502df158c 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild,v 1.1 2014/01/10 04:21:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-core/nepomuk-core-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Nepomuk core libraries"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug epub exif ffmpeg pdf taglib"
 
 DEPEND="
diff --git a/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild b/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild
index b46d13ad7edf..8a8abdf5c472 100644
--- a/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild
+++ b/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk-widgets/nepomuk-widgets-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Widget library for nepomuk"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/nepomuk/nepomuk-4.11.5.ebuild b/kde-base/nepomuk/nepomuk-4.11.5.ebuild
index be2c22098c2e..3c4aa693b3f4 100644
--- a/kde-base/nepomuk/nepomuk-4.11.5.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"
 HOMEPAGE+=" http://userbase.kde.org/Nepomuk"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/nsplugins/nsplugins-4.11.5.ebuild b/kde-base/nsplugins/nsplugins-4.11.5.ebuild
index 83ae86e322c2..fdecc2e7fb5c 100644
--- a/kde-base/nsplugins/nsplugins-4.11.5.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.11.5.ebuild,v 1.2 2014/01/20 08:00:49 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta pax-utils
 
 DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/okteta/okteta-4.11.5.ebuild b/kde-base/okteta/okteta-4.11.5.ebuild
index 735b544042c3..ddb3856d3c8c 100644
--- a/kde-base/okteta/okteta-4.11.5.ebuild
+++ b/kde-base/okteta/okteta-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.11.5.ebuild,v 1.1 2014/01/10 04:21:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE hexeditor"
 HOMEPAGE="http://www.kde.org/applications/utilities/okteta
 http://utils.kde.org/projects/okteta"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/okular/okular-4.11.5.ebuild b/kde-base/okular/okular-4.11.5.ebuild
index ef54d5a6c30f..834e001759b1 100644
--- a/kde-base/okular/okular-4.11.5.ebuild
+++ b/kde-base/okular/okular-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.11.5.ebuild,v 1.2 2014/01/16 17:20:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.11.5.ebuild,v 1.3 2014/01/20 08:00:12 kensington Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ inherit kde4-base
 
 DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4."
 HOMEPAGE="http://okular.kde.org http://www.kde.org/applications/graphics/okular"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff"
 
 DEPEND="
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild
index 993e938d7259..ecf7e5473eaf 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.11.5.ebuild,v 1.2 2014/01/20 08:00:02 kensington Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SRC_URI="
 "
 
 LICENSE="LGPL-3"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="bindist"
 
 DEPEND=""
diff --git a/kde-base/pairs/pairs-4.11.5.ebuild b/kde-base/pairs/pairs-4.11.5.ebuild
index f6c7744158b6..7631c8081b52 100644
--- a/kde-base/pairs/pairs-4.11.5.ebuild
+++ b/kde-base/pairs/pairs-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pairs/pairs-4.11.5.ebuild,v 1.1 2014/01/10 04:22:01 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pairs/pairs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:14 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE memory and pairs game"
 HOMEPAGE="http://edu.kde.org/applications/miscellaneous/pairs"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""
diff --git a/kde-base/palapeli/palapeli-4.11.5.ebuild b/kde-base/palapeli/palapeli-4.11.5.ebuild
index 8df37a34d3df..7cad0c3b9019 100644
--- a/kde-base/palapeli/palapeli-4.11.5.ebuild
+++ b/kde-base/palapeli/palapeli-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.11.5.ebuild,v 1.1 2014/01/10 04:21:52 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/palapeli/palapeli-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE jigsaw puzzle game"
 HOMEPAGE="http://www.kde.org/applications/games/palapeli/"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/parley/parley-4.11.5.ebuild b/kde-base/parley/parley-4.11.5.ebuild
index f3f70b5a2eff..1cbc1d9ca5e1 100644
--- a/kde-base/parley/parley-4.11.5.ebuild
+++ b/kde-base/parley/parley-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.11.5.ebuild,v 1.1 2014/01/10 04:21:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.11.5.ebuild,v 1.2 2014/01/20 08:00:52 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE Educational: vocabulary trainer"
 HOMEPAGE="http://www.kde.org/applications/education/parley
 http://edu.kde.org/applications/school/parley"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="
diff --git a/kde-base/perlkde/perlkde-4.11.5.ebuild b/kde-base/perlkde/perlkde-4.11.5.ebuild
index 2a920f2179c2..8af1bffdb4ae 100644
--- a/kde-base/perlkde/perlkde-4.11.5.ebuild
+++ b/kde-base/perlkde/perlkde-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.11.5.ebuild,v 1.2 2014/01/20 08:00:21 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Perl bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi attica debug kate okular semantic-desktop test"
 
 RDEPEND="
diff --git a/kde-base/perlqt/perlqt-4.11.5.ebuild b/kde-base/perlqt/perlqt-4.11.5.ebuild
index b46d4e248ce6..efe6e029f9a1 100644
--- a/kde-base/perlqt/perlqt-4.11.5.ebuild
+++ b/kde-base/perlqt/perlqt-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.11.5.ebuild,v 1.1 2014/01/10 04:21:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.11.5.ebuild,v 1.2 2014/01/20 08:00:40 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-base
 
 DESCRIPTION="Qt Perl bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon qimageblitz qscintilla qwt webkit"
 
 RDEPEND="
diff --git a/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild b/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild
index 59744bd6daf8..b82536972e7a 100644
--- a/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild,v 1.1 2014/01/10 04:21:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.11.5.ebuild,v 1.2 2014/01/20 08:00:33 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Phonon KDE Integration"
 HOMEPAGE="http://phonon.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
diff --git a/kde-base/picmi/picmi-4.11.5.ebuild b/kde-base/picmi/picmi-4.11.5.ebuild
index 2063d61ecd9c..7fb95b1ae3a2 100644
--- a/kde-base/picmi/picmi-4.11.5.ebuild
+++ b/kde-base/picmi/picmi-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/picmi/picmi-4.11.5.ebuild,v 1.1 2014/01/10 04:22:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/picmi/picmi-4.11.5.ebuild,v 1.2 2014/01/20 08:00:55 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Nonogram logic game for KDE"
 HOMEPAGE="http://games.kde.org/game.php?game=picmi"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/picmi/picmi-4.12.1.ebuild b/kde-base/picmi/picmi-4.12.1.ebuild
index 67d187cf2da3..43f766294eac 100644
--- a/kde-base/picmi/picmi-4.12.1.ebuild
+++ b/kde-base/picmi/picmi-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/picmi/picmi-4.12.1.ebuild,v 1.1 2014/01/18 11:23:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/picmi/picmi-4.12.1.ebuild,v 1.2 2014/01/19 10:58:46 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Nonogram logic game for KDE"
 HOMEPAGE="http://games.kde.org/game.php?game=picmi"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"
diff --git a/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild b/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild
index ca2b7cdb6915..a94a22daa22d 100644
--- a/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild,v 1.1 2014/01/10 04:21:55 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.11.5.ebuild,v 1.2 2014/01/20 08:00:23 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild
index 0274ddd889d2..b626702eb70a 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild,v 1.1 2014/01/10 04:22:13 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.11.5.ebuild,v 1.2 2014/01/20 08:00:36 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild
index 3b80467a631a..56bb11e9fe5c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild,v 1.1 2014/01/10 04:21:31 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.11.5.ebuild,v 1.2 2014/01/20 08:00:48 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ OPENGL_REQUIRED="always"
 inherit python-single-r1 kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps json python qalculate semantic-desktop"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-base/powerdevil/powerdevil-4.11.5.ebuild b/kde-base/powerdevil/powerdevil-4.11.5.ebuild
index fbb8f3db7041..5cfa466a2e8b 100644
--- a/kde-base/powerdevil/powerdevil-4.11.5.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.11.5.ebuild,v 1.1 2014/01/10 04:21:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.11.5.ebuild,v 1.2 2014/01/20 08:00:05 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
 HOMEPAGE="http://solid.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +pm-utils"
 
 DEPEND="
diff --git a/kde-base/poxml/poxml-4.11.5.ebuild b/kde-base/poxml/poxml-4.11.5.ebuild
index 7ba68bc576b0..6b0edf815863 100644
--- a/kde-base/poxml/poxml-4.11.5.ebuild
+++ b/kde-base/poxml/poxml-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/poxml/poxml-4.11.5.ebuild,v 1.1 2014/01/10 04:21:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/poxml/poxml-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ JAVA_PKG_OPT_USE=extras
 inherit java-pkg-opt-2 java-ant-2 kde4-base
 
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug extras"
 
 DEPEND="
diff --git a/kde-base/print-manager/print-manager-4.11.5.ebuild b/kde-base/print-manager/print-manager-4.11.5.ebuild
index f138c24eac0b..fea99904b089 100644
--- a/kde-base/print-manager/print-manager-4.11.5.ebuild
+++ b/kde-base/print-manager/print-manager-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.11.5.ebuild,v 1.1 2014/01/10 04:22:18 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/print-manager/print-manager-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/pykde4/pykde4-4.11.5.ebuild b/kde-base/pykde4/pykde4-4.11.5.ebuild
index 7f551849a8e8..d6efc187181a 100644
--- a/kde-base/pykde4/pykde4-4.11.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.11.5.ebuild,v 1.1 2014/01/10 04:21:56 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.11.5.ebuild,v 1.2 2014/01/20 08:00:22 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="always"
 inherit python-r1 portability kde4-base multilib
 
 DESCRIPTION="Python bindings for KDE4"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples semantic-desktop test"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Python"
 
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild
index 843ee3721902..5c77ae13f1f5 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild,v 1.1 2014/01/10 04:21:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.5.ebuild,v 1.2 2014/01/20 08:00:50 kensington Exp $
 
 EAPI=5
 
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/qtruby/qtruby-4.11.5.ebuild b/kde-base/qtruby/qtruby-4.11.5.ebuild
index e9e8914ffc0d..b8c447c16f69 100644
--- a/kde-base/qtruby/qtruby-4.11.5.ebuild
+++ b/kde-base/qtruby/qtruby-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.11.5.ebuild,v 1.2 2014/01/20 08:00:35 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ USE_RUBY="ruby19"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="Qt Ruby bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon qscintilla qwt webkit"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
 
diff --git a/kde-base/qyoto/qyoto-4.11.5.ebuild b/kde-base/qyoto/qyoto-4.11.5.ebuild
index 9cd7603ccc47..e1da1fa7a043 100644
--- a/kde-base/qyoto/qyoto-4.11.5.ebuild
+++ b/kde-base/qyoto/qyoto-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.11.5.ebuild,v 1.2 2014/01/20 08:00:05 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_REQUIRED="never"
 inherit mono-env kde4-base
 
 DESCRIPTION="C# bindings for Qt"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +phonon qscintilla webkit"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Qyoto"
 
diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild
index 88ae3010f672..7cf0bc2daccb 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild,v 1.1 2014/01/10 04:22:02 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-plugins/renamedlg-plugins-4.11.5.ebuild,v 1.2 2014/01/20 08:00:56 kensington Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ KMMODULE="renamedlgplugins"
 inherit kde4-meta
 
 DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/rocs/rocs-4.11.5.ebuild b/kde-base/rocs/rocs-4.11.5.ebuild
index 5a159a47ba8f..b018fe6e4a80 100644
--- a/kde-base/rocs/rocs-4.11.5.ebuild
+++ b/kde-base/rocs/rocs-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.11.5.ebuild,v 1.1 2014/01/10 04:22:02 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.11.5.ebuild,v 1.2 2014/01/20 08:00:45 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE4 interface to work with Graph Theory"
 HOMEPAGE="http://www.kde.org/applications/education/rocs
 http://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/smokegen/smokegen-4.11.5.ebuild b/kde-base/smokegen/smokegen-4.11.5.ebuild
index 715db1a616dc..356536e6f79b 100644
--- a/kde-base/smokegen/smokegen-4.11.5.ebuild
+++ b/kde-base/smokegen/smokegen-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.11.5.ebuild,v 1.1 2014/01/10 04:22:06 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.11.5.ebuild,v 1.2 2014/01/20 08:00:24 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke"
 
diff --git a/kde-base/smokekde/smokekde-4.11.5.ebuild b/kde-base/smokekde/smokekde-4.11.5.ebuild
index 7c416a797565..630a0c5e85d7 100644
--- a/kde-base/smokekde/smokekde-4.11.5.ebuild
+++ b/kde-base/smokekde/smokekde-4.11.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.11.5.ebuild,v 1.1 2014/01/10 04:21:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="attica debug kate okular semantic-desktop"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke"
 
diff --git a/kde-base/smokeqt/smokeqt-4.11.5.ebuild b/kde-base/smokeqt/smokeqt-4.11.5.ebuild
index 01dd5a711bac..4ca1cb2ba01b 100644
--- a/kde-base/smokeqt/smokeqt-4.11.5.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.11.5.ebuild,v 1.1 2014/01/10 04:22:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokeqt/smokeqt-4.11.5.ebuild,v 1.2 2014/01/20 08:00:21 kensington Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Smoke"
 
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild
index 58e68576f7bf..f3b5143fd839 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild
+++ b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild,v 1.1 2014/01/10 04:21:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.5.ebuild,v 1.2 2014/01/20 08:00:57 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE control module for Solid actions"
 HOMEPAGE="http://solid.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild b/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild
index e9e0c1bd9e9c..c28cbb40e57b 100644
--- a/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid-runtime/solid-runtime-4.11.5.ebuild,v 1.2 2014/01/20 08:00:25 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
 HOMEPAGE="http://solid.kde.org"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug bluetooth networkmanager"
 
 KMEXTRA="
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
deleted file mode 100644
index faba8d531d60..000000000000
--- a/kde-base/solid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-workspace-4.10.5.tar.xz 13569732 SHA256 a346420258f96475b47a7e3a78945fc38c10d4732b01d8fc371d11dcad56e875 SHA512 b90d015a91298cf98aebda60f08d18ff8afdfc813b4d27aa245fd2d3cc5bd31c3fcd57ce85fc188c167cd33b6d9ca537dbd5349871182062542ef526c360f0ff WHIRLPOOL 4a2448eb586c5223a9b86be5206f037de1765fe625a5fa0d222c35a1a61376b42625b52db453e2db1e88eb7efdea94fb375622d6db79ec29b0038eed3a6df331
diff --git a/kde-base/solid/metadata.xml b/kde-base/solid/metadata.xml
deleted file mode 100644
index 55b21c0e5f8a..000000000000
--- a/kde-base/solid/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="wicd">Enable Wicd wired and wireless network manager.</flag>
-</use>
-</pkgmetadata>
diff --git a/kde-base/solid/solid-4.10.5.ebuild b/kde-base/solid/solid-4.10.5.ebuild
deleted file mode 100644
index 8418b1303b18..000000000000
--- a/kde-base/solid/solid-4.10.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.10.5.ebuild,v 1.6 2013/08/02 14:30:01 ago Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="Solid: the KDE hardware library"
-HOMEPAGE="http://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug bluetooth networkmanager wicd"
-
-DEPEND="
-	networkmanager? ( net-misc/networkmanager )
-	wicd? ( net-misc/wicd )
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep solid-runtime)
-"
-
-PDEPEND="bluetooth? ( net-wireless/bluedevil )"
-
-KMEXTRA="
-	libs/solid/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_build wicd)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/step/step-4.11.5.ebuild b/kde-base/step/step-4.11.5.ebuild
index 945a056395bf..44e43c70cb2e 100644
--- a/kde-base/step/step-4.11.5.ebuild
+++ b/kde-base/step/step-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.11.5.ebuild,v 1.1 2014/01/10 04:21:51 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.11.5.ebuild,v 1.2 2014/01/20 08:00:18 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="The KDE physics simulator"
 HOMEPAGE="http://edu.kde.org/step"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +gsl +qalculate"
 
 DEPEND="
diff --git a/kde-base/superkaramba/superkaramba-4.11.5.ebuild b/kde-base/superkaramba/superkaramba-4.11.5.ebuild
index 127933144635..57d666aee549 100644
--- a/kde-base/superkaramba/superkaramba-4.11.5.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.11.5.ebuild,v 1.1 2014/01/10 04:22:09 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.11.5.ebuild,v 1.2 2014/01/20 08:00:07 kensington Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
 HOMEPAGE="http://www.kde.org/applications/utilities/superkaramba
 http://utils.kde.org/projects/superkaramba"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-base/svgpart/svgpart-4.11.5.ebuild b/kde-base/svgpart/svgpart-4.11.5.ebuild
index adb338e646eb..9d819bf19a91 100644
--- a/kde-base/svgpart/svgpart-4.11.5.ebuild
+++ b/kde-base/svgpart/svgpart-4.11.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.11.5.ebuild,v 1.1 2014/01/10 04:22:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/svgpart/svgpart-4.11.5.ebuild,v 1.2 2014/01/20 08:00:34 kensington Exp $
 
 EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/sweeper/sweeper-4.11.5.ebuild b/kde-base/sweeper/sweeper-4.11.5.ebuild
index ef48b649e982..8fc7815d36c3 100644
--- a/kde-base/sweeper/sweeper-4.11.5.ebuild
+++ b/kde-base/sweeper/sweeper-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.11.5.ebuild,v 1.1 2014/01/10 04:22:05 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/sweeper/sweeper-4.11.5.ebuild,v 1.2 2014/01/20 08:00:44 kensington Exp $
 
 EAPI=5
 
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE Privacy Settings Widget"
 HOMEPAGE="http://www.kde.org/applications/utilities/sweeper
 http://utils.kde.org/projects/sweeper"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/systemsettings/systemsettings-4.11.5.ebuild b/kde-base/systemsettings/systemsettings-4.11.5.ebuild
index e05fdee07003..c62c1c351619 100644
--- a/kde-base/systemsettings/systemsettings-4.11.5.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.11.5.ebuild,v 1.1 2014/01/10 04:21:40 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.11.5.ebuild,v 1.2 2014/01/20 08:00:23 kensington Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ inherit kde4-meta
 DESCRIPTION="System settings utility"
 HOMEPAGE+=" http://userbase.kde.org/System_Settings"
 IUSE="debug gtk semantic-desktop +usb"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
 	app-misc/strigi
diff --git a/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild b/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild
index e27867d9694c..d4705eb8febb 100644
--- a/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild,v 1.1 2014/01/10 04:22:02 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/thumbnailers/thumbnailers-4.11.5.ebuild,v 1.2 2014/01/20 08:00:15 kensington Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KMNAME="kdegraphics-thumbnailers"
 inherit kde4-base
 
 DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-base/umbrello/umbrello-4.11.5.ebuild b/kde-base/umbrello/umbrello-4.11.5.ebuild
index b985ead3f31b..a062e3c80e20 100644
--- a/kde-base/umbrello/umbrello-4.11.5.ebuild
+++ b/kde-base/umbrello/umbrello-4.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.11.5.ebuild,v 1.1 2014/01/10 04:21:53 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.11.5.ebuild,v 1.2 2014/01/20 08:00:54 kensington Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="
 	http://www.kde.org/applications/development/umbrello
 	http://umbrello.kde.org
 "
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild b/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild
index 6eebde4ceee2..42e8632fde15 100644
--- a/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild
+++ b/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild,v 1.4 2014/01/14 15:41:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kwebkitpart/kwebkitpart-1.3.3.ebuild,v 1.5 2014/01/19 10:21:59 ago Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ HOMEPAGE="https://projects.kde.org/projects/extragear/base/kwebkitpart"
 SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 SLOT="4"
 IUSE="debug"
diff --git a/mail-mta/postfix/postfix-2.11.0.ebuild b/mail-mta/postfix/postfix-2.11.0.ebuild
index 7d72e45a2e5c..96b9205dc15f 100644
--- a/mail-mta/postfix/postfix-2.11.0.ebuild
+++ b/mail-mta/postfix/postfix-2.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.0.ebuild,v 1.1 2014/01/18 14:16:12 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11.0.ebuild,v 1.2 2014/01/20 00:57:27 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
@@ -19,7 +19,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-2.12_pre20140109.ebuild b/mail-mta/postfix/postfix-2.12_pre20140109.ebuild
index b3227a5f60ef..f36dcb5d3b85 100644
--- a/mail-mta/postfix/postfix-2.12_pre20140109.ebuild
+++ b/mail-mta/postfix/postfix-2.12_pre20140109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20140109.ebuild,v 1.1 2014/01/18 14:27:54 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20140109.ebuild,v 1.2 2014/01/19 11:47:25 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
@@ -19,7 +19,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-gfx/digikam/digikam-3.5.0.ebuild b/media-gfx/digikam/digikam-3.5.0.ebuild
index 997239746e3e..d83df1c14015 100644
--- a/media-gfx/digikam/digikam-3.5.0.ebuild
+++ b/media-gfx/digikam/digikam-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-3.5.0.ebuild,v 1.3 2014/01/18 13:44:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-3.5.0.ebuild,v 1.4 2014/01/19 15:39:21 pacho Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
 
diff --git a/media-gfx/feh/feh-2.9.3.ebuild b/media-gfx/feh/feh-2.9.3.ebuild
index 733771bc41d1..b8dbc3cb1653 100644
--- a/media-gfx/feh/feh-2.9.3.ebuild
+++ b/media-gfx/feh/feh-2.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.9.3.ebuild,v 1.3 2014/01/18 18:55:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.9.3.ebuild,v 1.4 2014/01/19 10:28:44 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="debug curl exif test xinerama"
 
 COMMON_DEPEND=">=media-libs/giblib-1.2.4
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index a49d72e56d6e..e400c062bffd 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,2 +1,3 @@
 DIST pngquant-1.8.2-src.tar.bz2 31901 SHA256 a51924ad141c010516e46122e84c6d1882d26b7e984900aaa107d74274e1a396 SHA512 394688ea754be781f96372a793c4186d35014dc1fc3b974e2335542d0aaaebe811bd4db5c34f7d7ec492aa38ff8b46c43a6ce77dc78483c4d43afb8aef8ba708 WHIRLPOOL 1904afa05206b11458fe54889cfacee0267f85379186e1cd344a4dc8411598e79e1950a90e1f997b212e0a5b8ed3c13acfce36a2300e0afa295c0eac361d44fa
 DIST pngquant-1.8.3-src.tar.bz2 32287 SHA256 e3d18b12ddf4ee159a696408b147d667674e52121f11660fc15ce3967dd053b9 SHA512 6a123722d1b035fd9cff51004ab222e5d6cc09890cdc440683609b187d492a24f924fec7b15201c8c4bff84bb3891d7f17a99fd24714b71d4ab3c8ac5c3cfc38 WHIRLPOOL a799e840e645c6bd5ec4ce118d5af8b263f3d1ca0ed898ed447bee8ffa98d61eb97eab392cd7db0440600568809891b9cac1c033cfecac65d0c36bca446f469f
+DIST pngquant-2.0.2-src.tar.bz2 45160 SHA256 e1988b18cab1efb889224ac1d640510f09464b5b6fd43beb5edcb161b67db96f SHA512 9e7f652c8e32d408e3f2ccd7854961d8b49e3517f847018cddb9ed415f4bc820c00d27a15760222af33e631a2023c57c420ca306a56f717d2de526da4b5670b8 WHIRLPOOL f0af27fbd3d172677b5cae0bf20d13b71a66fb7738c3b9576b19b785a29b6cd77c21935b3aeb51230696cfb05f4495eca2977d885d616e344f0bf2be079e3621
diff --git a/media-gfx/pngquant/pngquant-2.0.2.ebuild b/media-gfx/pngquant/pngquant-2.0.2.ebuild
new file mode 100644
index 000000000000..9beae10107a2
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngquant/pngquant-2.0.2.ebuild,v 1.1 2014/01/19 07:33:29 ssuominen Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="a command-line utility for converting 24/32-bit PNG images to paletted (8-bit) PNGs"
+HOMEPAGE="http://pngquant.org/"
+SRC_URI="http://pngquant.org/${P}-src.tar.bz2"
+
+LICENSE="HPND rwpng"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE="debug openmp sse2"
+
+RDEPEND="media-libs/libpng:0=
+	sys-libs/zlib:="
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	# Failure in upstream logic. Otherwise we lose the -I and -L flags
+	# from Makefile.
+	sed -i \
+		-e 's:CFLAGS ?=:CFLAGS +=:' \
+		-e 's:LDFLAGS ?=:LDFLAGS +=:' \
+		Makefile || die
+}
+
+src_compile() {
+	use debug || append-cflags -DNDEBUG
+	use sse2 && append-cflags -DUSE_SSE=1
+
+	local openmp
+	if use openmp && tc-has-openmp; then
+		append-cflags -fopenmp
+		openmp="-lgomp"
+	fi
+
+	tc-export CC
+	emake CFLAGSOPT="" OPENMPFLAGS="${openmp}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGELOG README.md
+}
diff --git a/media-gfx/qrencode/qrencode-3.3.1.ebuild b/media-gfx/qrencode/qrencode-3.3.1.ebuild
index bae29c2df454..8a1fae45d85e 100644
--- a/media-gfx/qrencode/qrencode-3.3.1.ebuild
+++ b/media-gfx/qrencode/qrencode-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.3.1.ebuild,v 1.9 2014/01/07 09:33:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.3.1.ebuild,v 1.11 2014/01/19 10:49:21 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libpng"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
index 1c55f077f861..62219563557c 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild,v 1.6 2014/01/18 20:18:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild,v 1.7 2014/01/19 10:32:00 ago Exp $
 
 EAPI="5"
 
@@ -117,7 +117,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( virtual/jpeg )
diff --git a/media-gfx/viewnior/viewnior-1.3.ebuild b/media-gfx/viewnior/viewnior-1.3.ebuild
index b14c72a6776b..9d567069b9ed 100644
--- a/media-gfx/viewnior/viewnior-1.3.ebuild
+++ b/media-gfx/viewnior/viewnior-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/viewnior/viewnior-1.3.ebuild,v 1.2 2013/02/02 03:33:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/viewnior/viewnior-1.3.ebuild,v 1.3 2014/01/19 17:06:53 pacho Exp $
 
 EAPI="4"
 inherit fdo-mime gnome2-utils autotools
@@ -11,7 +11,7 @@ SRC_URI="mirror://github/xsisqox/Viewnior/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/glib:2
diff --git a/media-libs/faac/faac-1.28-r4.ebuild b/media-libs/faac/faac-1.28-r4.ebuild
index f4635e0a526f..c386cb19578b 100644
--- a/media-libs/faac/faac-1.28-r4.ebuild
+++ b/media-libs/faac/faac-1.28-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r4.ebuild,v 1.9 2014/01/18 20:10:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r4.ebuild,v 1.10 2014/01/19 10:22:12 ago Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libmp4v2:0=
diff --git a/media-libs/glyr/glyr-1.0.1.ebuild b/media-libs/glyr/glyr-1.0.1.ebuild
index 5e1923ef0419..17deae707b5e 100644
--- a/media-libs/glyr/glyr-1.0.1.ebuild
+++ b/media-libs/glyr/glyr-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glyr/glyr-1.0.1.ebuild,v 1.1 2013/05/26 07:41:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glyr/glyr-1.0.1.ebuild,v 1.2 2014/01/19 18:56:06 pacho Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-db/sqlite:3
 	>=dev-libs/glib-2.10:2
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index d41710bd421f..ec261fcf3674 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild,v 1.7 2014/01/18 20:10:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild,v 1.8 2014/01/19 10:22:25 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index dde3df9f449c..494b87fdf6d5 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,5 +1,2 @@
-DIST lensfun-0.2.5.tar.bz2 470733 SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87 SHA512 a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa WHIRLPOOL 6e85477234988e1a060eb97810ad856360ee81eea15978ac7d9fd93a864ece5a6b3b64f81fa506a50c999ae281a283a269fa59ffb854089ad638ce6d3ce8cbed
-DIST lensfun-0.2.5_p153.tar.xz 466656 SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff SHA512 7263ea69d89e710f84e6f1c3c9287f8f54efe3823fd9babe2c3e191c38a8e17664ed3e330771f2c2579c65cbadb56eaa277362860ee39549238d0926a8d9d23d WHIRLPOOL 86f8e0f4f4a43c41d5965aeb9941d1e8b1068dd3a182c9954b4a0600600dcc55a4eef1049d9e19aa5a3e5d0e02201325774cbb5cc47cecd88b2608069a257c96
-DIST lensfun-0.2.6.tar.bz2 505690 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e SHA512 209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1 WHIRLPOOL 198a2834d6966c83fdd293b52a3a3b289c932989b123484394dddd9550c9a6ac41d14017894e1288debe2865d5f3bafb34f714040a3523b76335c563bad6ae47
 DIST lensfun-0.2.7.tar.bz2 552960 SHA256 3ddf0747bd6af1ec7d722f8c45dafdd8adfb96c081492b216c14d89f82806477 SHA512 0df48ef824bd562065cc1eaf611870ab526cd64a32f99947f1f1c0c633280f4fc2f248d38da65dc0627d399085da4c35c938a42a64753976c8dfb5fbd97c96f2 WHIRLPOOL 039f93f4a8dcd6d3ec88ad453151346ba6c92b3d36130c406c9aed7cbfad9c2a2bdfcfe866df5070026042f3980ed345604bda0d8faf4130f078d26da9032dc8
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
diff --git a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch b/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
deleted file mode 100644
index 6d10b6c7d0ca..000000000000
--- a/media-libs/lensfun/files/lensfun-0.2.5-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libs/auxfun/image.cpp
-+++ libs/auxfun/image.cpp
-@@ -94,7 +94,7 @@ bool Image::LoadPNG ()
- 
-     png_init_io (png, file);
- 
--    if (setjmp (png->jmpbuf))
-+    if (setjmp (png_jmpbuf(png)))
-         // If we get here, we had a problem reading the file
-         goto nomem;
- 
-@@ -157,7 +157,7 @@ bool Image::LoadPNG ()
-     row_pointers = new png_bytep [Height];
- 
-     if (!row_pointers
--        || setjmp (png->jmpbuf))             // Set a new exception handler
-+        || setjmp (png_jmpbuf(png)))             // Set a new exception handler
-     {
-         delete [] row_pointers;
-     nomem:
-@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName)
-     }
- 
-     /* Catch processing errors */
--    if (setjmp(png->jmpbuf))
-+    if (setjmp(png_jmpbuf(png)))
-         /* If we get here, we had a problem writing the file */
-         goto error2;
- 
-@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName)
-     /* It is REQUIRED to call this to finish writing the rest of the file */
-     png_write_end (png, info);
- 
--    /* if you malloced the palette, free it here */
--    if (info->palette)
--        free (info->palette);
--
-     /* clean up after the write, and free any memory allocated */
-     png_destroy_write_struct (&png, &info);
- 
diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
deleted file mode 100644
index 425031dd511f..000000000000
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- docs/CMakeLists.txt
-+++ docs/CMakeLists.txt
-@@ -11,7 +11,7 @@
- CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY)
- 
- # now build documentation
--ADD_CUSTOM_TARGET(doc
-+ADD_CUSTOM_TARGET(doc ALL
-   COMMAND "${DOXYGEN_EXECUTABLE}"
-   DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in
-   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-@@ -19,5 +19,4 @@
- )
- 
- # install documentation  
--FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*")
--INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR})
-+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -30,7 +30,7 @@
- 
- # options controlling the build process
- OPTION(BUILD_STATIC "Build static library" OFF)
--OPTION(BUILD_TESTS "Build test programs" ON)
-+OPTION(BUILD_TESTS "Build test programs" OFF)
- OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
- OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF)
- OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF)
-@@ -71,13 +71,13 @@
- IF(BUILD_STATIC)
-   ADD_DEFINITIONS(-DCONF_LENSFUN_STATIC)
- ENDIF()
-- 
-+
- # define destination dirs (relative to prefix)
- SET(BINDIR bin)
--SET(LIBDIR lib)
-+# SET(LIBDIR lib)
- SET(INCLUDEDIR include)
- SET(DATADIR share/lensfun)
--SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
-+# SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
- 
- IF(WIN32)
-   SET(PLATFORM_WINDOWS 1)
-@@ -125,12 +125,12 @@
- ENDIF()
- 
- # install include files
--INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun)
-+INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR})
- IF(NOT HAVE_REGEX_H)
-   INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
- ENDIF()
- IF(BUILD_AUXFUN)
--  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun)
-+  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR})
- ENDIF()
- 
- # install db files
diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
deleted file mode 100644
index a68cf55521f5..000000000000
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libs/lensfun/CMakeLists.txt
-+++ libs/lensfun/CMakeLists.txt
-@@ -26,3 +26,12 @@
-         RUNTIME DESTINATION ${BINDIR}
-         LIBRARY DESTINATION ${LIBDIR}
-         ARCHIVE DESTINATION ${LIBDIR})
-+
-+IF(UNIX AND NOT APPLE)
-+  SET(CONF_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}")
-+  SET(CONF_LIBDIR "${CMAKE_INSTALL_LIBDIR}/")
-+  SET(CONF_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}/")
-+  SET(CONF_LENSFUN_STATIC "")
-+  CONFIGURE_FILE("lensfun.pc.in" "lensfun.pc" @ONLY)
-+  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+ENDIF(UNIX AND NOT APPLE)
diff --git a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild b/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
deleted file mode 100644
index c53ab7d3eebf..000000000000
--- a/media-libs/lensfun/lensfun-0.2.5-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5-r2.ebuild,v 1.14 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=2
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.berlios.de/"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.0 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable stripping, remove ricer CFLAGS
-	sed -i \
-		-e 's:-s -O3 -fomit-frame-pointer -funroll-loops::g' \
-		-e 's:GCC.LDFLAGS.release = -s:GCC.LDFLAGS.release =:g' \
-		build/tibs/compiler/gcc.mak || die
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	tc-export CXX
-	export LD="${CXX}"
-
-	local myconf=""
-	use debug && myconf="--mode=debug"
-	# econf does NOT work
-	./configure --prefix=/usr --docdir="/usr/share/doc/${PF}" --vectorization= ${myconf} || die
-}
-
-src_compile() {
-	emake all V=1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# TODO remove docs if ! use doc
-}
diff --git a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
deleted file mode 100644
index a8bf3ab718be..000000000000
--- a/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5_p153-r1.ebuild,v 1.3 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=4
-inherit python multilib cmake-utils
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.berlios.de/"
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-pc.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build doc)
-		-DLIBDIR=$(get_libdir)
-		-DDOCDIR=/usr/share/doc/${P}
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/lensfun/lensfun-0.2.6.ebuild b/media-libs/lensfun/lensfun-0.2.6.ebuild
deleted file mode 100644
index 89d4f5d36618..000000000000
--- a/media-libs/lensfun/lensfun-0.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.6.ebuild,v 1.4 2013/03/03 11:05:34 vapier Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-
-inherit cmake-utils multilib python
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc sse sse2"
-
-RDEPEND=">=dev-libs/glib-2.28
-	media-libs/libpng:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-auxfun.patch
-	"${FILESDIR}"/${PN}-0.2.5_p153-build.patch
-	"${FILESDIR}"/${PN}-0.2.5_p153-pc.patch
-	)
-
-DOCS=( README docs/mounts.txt )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DLIBDIR=$(get_libdir)
-		-DBUILD_AUXFUN=ON
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build sse FOR_SSE)
-		$(cmake-utils_use_build sse2 FOR_SSE2)
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=OFF
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
index 27add794436d..425bcbb06ebb 100644
--- a/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libXcm/libXcm-0.5.2-r1.ebuild,v 1.3 2013/06/24 17:18:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libXcm/libXcm-0.5.2-r1.ebuild,v 1.4 2014/01/19 08:51:26 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/oyranos/${PN}/${PN}-0.4.x/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="X doc static-libs"
 
 RDEPEND="X? ( x11-libs/libXmu[${MULTILIB_USEDEP}]
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index d0f49feb709b..979336ff5470 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcuefile/libcuefile-477-r1.ebuild,v 1.6 2014/01/18 20:10:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcuefile/libcuefile-477-r1.ebuild,v 1.7 2014/01/19 10:22:38 ago Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 45ae022ae90a..9e6e4f27541f 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/libdca-0.0.5-r3.ebuild,v 1.9 2014/01/18 20:11:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/libdca-0.0.5-r3.ebuild,v 1.10 2014/01/19 10:22:51 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild
index 9edd5e4beaf3..215b48187719 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild,v 1.8 2014/01/18 20:11:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild,v 1.9 2014/01/19 10:23:04 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libfame/libfame-0.9.1-r2.ebuild b/media-libs/libfame/libfame-0.9.1-r2.ebuild
index aa3f12380293..5398b27449a5 100644
--- a/media-libs/libfame/libfame-0.9.1-r2.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r2.ebuild,v 1.8 2014/01/18 20:11:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r2.ebuild,v 1.9 2014/01/19 10:23:17 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 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="mmx static-libs"
 
 PATCHES=(
diff --git a/media-libs/libgii/libgii-1.0.2-r1.ebuild b/media-libs/libgii/libgii-1.0.2-r1.ebuild
index 7a2067587896..241006cf4757 100644
--- a/media-libs/libgii/libgii-1.0.2-r1.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-1.0.2-r1.ebuild,v 1.8 2014/01/18 20:11:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-1.0.2-r1.ebuild,v 1.9 2014/01/19 10:23:30 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/media-libs/libkface/libkface-3.5.0.ebuild b/media-libs/libkface/libkface-3.5.0.ebuild
index d774c59411a7..0b9aa29a29cf 100644
--- a/media-libs/libkface/libkface-3.5.0.ebuild
+++ b/media-libs/libkface/libkface-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-3.5.0.ebuild,v 1.1 2013/10/12 16:49:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-3.5.0.ebuild,v 1.2 2014/01/19 15:40:00 pacho Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detec
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild b/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild
index 769376304747..d91cacd05c84 100644
--- a/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild,v 1.1 2013/10/12 16:55:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-3.5.0.ebuild,v 1.2 2014/01/19 15:40:16 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 SLOT=4
 
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild
index 8f426e63308e..8635abf74b64 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild,v 1.1 2013/11/23 23:00:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.65.ebuild,v 1.2 2014/01/19 16:51:26 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mediainfo/${PN}_${PV}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmms/libmms-0.6.2-r1.ebuild b/media-libs/libmms/libmms-0.6.2-r1.ebuild
index b96decdc592c..ffc5818d690a 100644
--- a/media-libs/libmms/libmms-0.6.2-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.6.2-r1.ebuild,v 1.6 2014/01/18 20:12:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.6.2-r1.ebuild,v 1.7 2014/01/19 10:23:43 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/libmpdclient/libmpdclient-2.9.ebuild b/media-libs/libmpdclient/libmpdclient-2.9.ebuild
index 5784a6a06ed1..40968c00d7ed 100644
--- a/media-libs/libmpdclient/libmpdclient-2.9.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpdclient/libmpdclient-2.9.ebuild,v 1.6 2014/01/14 15:35:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpdclient/libmpdclient-2.9.ebuild,v 1.7 2014/01/19 10:23:56 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 ~sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index b61da22b3284..cb2aeebf5812 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/libreplaygain-477-r1.ebuild,v 1.6 2014/01/18 20:12:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/libreplaygain-477-r1.ebuild,v 1.7 2014/01/19 10:24:09 ago Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index f15a14a6f23c..9c80525df67b 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild,v 1.7 2014/01/18 20:12:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild,v 1.8 2014/01/19 10:24:22 ago Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/media-libs/zvbi/zvbi-0.2.35.ebuild b/media-libs/zvbi/zvbi-0.2.35.ebuild
index 70dab341df64..f4ebecdbc4d0 100644
--- a/media-libs/zvbi/zvbi-0.2.35.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.35.ebuild,v 1.4 2014/01/18 20:12:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.35.ebuild,v 1.5 2014/01/19 10:24:35 ago Exp $
 
 EAPI=5
 inherit eutils libtool
@@ -11,7 +11,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-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="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.4
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
index e886331f5429..64c15b287a14 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild,v 1.2 2014/01/18 13:46:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild,v 1.3 2014/01/19 15:39:43 pacho Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="4"
 IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte"
 
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index 0c5964aa69af..acb0d1a82a32 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -1,2 +1,3 @@
 DIST dvbhddevice-0.0.8_p20130302.tar.gz 39484 SHA256 4572879d3c7621988b4d0d855c87c4823824d9635cf37dbdc42c1a739ffa4cee SHA512 bae68ac195ef7b0cd6eaee4fa08731aefc7e5758d0b2a495920990147fdd1fbbe7e9f22e619f100876ee3a8a45c92a4751daf8ed49a8164e4cb0906f29439a88 WHIRLPOOL 638a5dcb42b3bedc1eaeb0f6ff6cec0dd400016b84ecf3fc96c41a2729379e540497e2c6631b63fab9d95265caba854c051ce3765a6df45ea823a55ea19d6573
 DIST dvbhddevice-0.0.9_p20130409.tar.gz 39971 SHA256 f39d999e5938a2960f026fba1db6f830c584f84a720ef9d14a783937df5f8206 SHA512 49a2b183a538035b3119db1e2e943630c2edafdea0cbd6167485f8bb2549a12c7f8b2c85b7f752554346510aacaed9836768febc6e06600efb5503c746cca15e WHIRLPOOL 6240c807ab9146436da02812c8f8632e686f7b5fdb8ddc21ee5b1919151772d60737e59f4b2e34985d1c8cea5e0fbcf0bd0e328e4c2a15c140f59c7a7e3a9c70
+DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 SHA256 2914669b17b64c94072d6ab30d9c28d55c33d66ff2339efebf150919cf230bb3 SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4 WHIRLPOOL 10ef51a333ac3bb2fb60fde67ede4aa1f8ffc44b1334ca907aafd7c2bb30627cf413f5fa6c8e681eb4afa4f3ef43cead59ab512fab9a5a170f09bf6d9a81b516
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild
new file mode 100644
index 000000000000..73d122e41fe9
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild,v 1.1 2014/01/20 10:01:39 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+HG_REVISION="60c58ae453d0"
+HG_REVISION_DATE="20140115"
+
+DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
+S2-6400 DVB Card"
+HOMEPAGE="http://powarman.dyndns.org/hg/dvbhddevice"
+SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/dvbhddevice/archive/${HG_REVISION}.tar.gz
+-> dvbhddevice-2.1.3_p${HG_REVISION_DATE}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.7.39"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/dvbhddevice-${HG_REVISION}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include dvbhdffdevice.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	doheader dvbhdffdevice.h hdffcmd.h
+
+	insinto /usr/include/libhdffcmd
+	doins libhdffcmd/*.h
+}
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index ef8c8bbf48ca..71a96f9dca3d 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild,v 1.7 2014/01/15 10:44:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild,v 1.8 2014/01/19 17:19:33 pacho Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator multilib-minimal
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-admin/eselect-cdparanoia
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 68f6049d8de0..fe9cb1325bfb 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,2 +1,3 @@
 DIST easytag-2.1.7.tar.bz2 3303491 SHA256 bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301 SHA512 e98b0d407ed37a4ede6891e1998a6c158b308b9f462dc2b810b21b21b00fbecd9eef74a29552cdf037bf654f208340fa83b3b625f6ac0fcb5bd08413c17d3c88 WHIRLPOOL bfbfc50b88e714cdc0396961b7f1767d24dc445498c00000a9069a785ef63b0ac6ba87e60aeaaec47c49e078d11a3b5b388d44e9feb9406a49b9538460750c56
 DIST easytag-2.1.8.tar.xz 2459496 SHA256 1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48 WHIRLPOOL ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
+DIST easytag-2.1.9.tar.xz 921036 SHA256 f5a6e742a458ef6f48f2d5e98a24182a9c87a213e847fcce75c757ac90273501 SHA512 498d2268367287eb018936f6bed7b8688e1a7231cef43b87285b0b460ea5f5e53a802a4480e31b4421ea1a15383108a92769dcfa8ae1b657e790a04996f8820a WHIRLPOOL 3e0f6b7a303bcfd11af7d3aab84b2a2684df69e1afca4bd140154195aea2f62977b8263088221afe65ed6005198eed13d5cc0076bfc83cc3b48f85ded131e38e
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
index 39a151d811fe..a587a6565b17 100644
--- a/media-sound/easytag/easytag-2.1.8.ebuild
+++ b/media-sound/easytag/easytag-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.8.ebuild,v 1.7 2014/01/18 20:00:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.8.ebuild,v 1.8 2014/01/19 10:15:35 ago Exp $
 
 EAPI=5
 inherit eutils autotools gnome.org fdo-mime
@@ -10,7 +10,7 @@ HOMEPAGE="http://projects.gnome.org/easytag/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac mp3 mp4 nls speex vorbis wavpack"
 
 RDEPEND=">=x11-libs/gtk+-2.24:2
diff --git a/media-sound/easytag/easytag-2.1.9.ebuild b/media-sound/easytag/easytag-2.1.9.ebuild
new file mode 100644
index 000000000000..ac69b322ee8f
--- /dev/null
+++ b/media-sound/easytag/easytag-2.1.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.9.ebuild,v 1.2 2014/01/19 21:23:46 polynomial-c Exp $
+
+EAPI=5
+inherit eutils autotools gnome.org fdo-mime
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="http://projects.gnome.org/easytag/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac mp3 mp4 nls speex vorbis wavpack"
+
+RDEPEND=">=x11-libs/gtk+-2.24:2
+	mp3? (
+		>=media-libs/id3lib-3.8.3-r7
+		media-libs/libid3tag
+		)
+	flac? (
+		media-libs/flac
+		media-libs/libvorbis
+		)
+	mp4? ( media-libs/taglib[mp4] )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	speex? (
+		media-libs/speex
+		media-libs/libvorbis
+		)"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.8-werror.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable speex) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack)
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/mpc/mpc-0.25.ebuild b/media-sound/mpc/mpc-0.25.ebuild
index 1af3c6fbc14c..aceb9dd5f341 100644
--- a/media-sound/mpc/mpc-0.25.ebuild
+++ b/media-sound/mpc/mpc-0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.25.ebuild,v 1.6 2014/01/14 15:34:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.25.ebuild,v 1.7 2014/01/19 10:24:48 ago Exp $
 
 EAPI=4
 inherit bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 ~sparc x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/mpg321/mpg321-0.3.1-r1.ebuild b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
index 6ed88aad7ed8..600961b85c88 100644
--- a/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.3.1-r1.ebuild,v 1.7 2014/01/18 20:12:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.3.1-r1.ebuild,v 1.8 2014/01/19 10:25:01 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6"
 
 RDEPEND="app-admin/eselect-mpg123
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index f7f3bcc5820b..ba0409a929ed 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-465-r1.ebuild,v 1.6 2014/01/18 20:13:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-465-r1.ebuild,v 1.7 2014/01/19 10:25:14 ago Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
diff --git a/media-sound/podget/podget-0.6.15.ebuild b/media-sound/podget/podget-0.6.15.ebuild
index 2b28f99df5d7..feac4e65ea0f 100644
--- a/media-sound/podget/podget-0.6.15.ebuild
+++ b/media-sound/podget/podget-0.6.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/podget/podget-0.6.15.ebuild,v 1.1 2013/09/13 23:04:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/podget/podget-0.6.15.ebuild,v 1.2 2014/01/20 07:58:12 heroxbd Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/pragha/pragha-1.1.2.1.ebuild b/media-sound/pragha/pragha-1.1.2.1.ebuild
index 192c5c7dfe38..284ea8ce8b15 100644
--- a/media-sound/pragha/pragha-1.1.2.1.ebuild
+++ b/media-sound/pragha/pragha-1.1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/pragha-1.1.2.1.ebuild,v 1.1 2013/08/24 12:16:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pragha/pragha-1.1.2.1.ebuild,v 1.2 2014/01/19 19:06:38 pacho Exp $
 
 EAPI=5
 inherit flag-o-matic xfconf
@@ -11,7 +11,7 @@ SRC_URI="http://dissonance.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +glyr lastfm +playlist"
 
 COMMON_DEPEND="dev-db/sqlite:3
diff --git a/media-sound/wavpack/wavpack-4.60.1-r1.ebuild b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
index e0c7c5582d95..a3e288351470 100644
--- a/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
+++ b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1-r1.ebuild,v 1.10 2014/01/18 20:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavpack/wavpack-4.60.1-r1.ebuild,v 1.11 2014/01/19 10:25:27 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="mmx static-libs"
 
 RDEPEND="virtual/libiconv[${MULTILIB_USEDEP}]
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 59fad02a0335..9c3b3d2e051e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,5 @@
 DIST ffmpeg-0.10.10.tar.bz2 5785849 SHA256 936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91 SHA512 7179cb29596c67faedc73e57f0b7d55a9e05a3d036aa0454c47e316cdcaf16f7f2d8deb58380c2a02df3fce322089d9e6476024da5832b9b5e39c46d48b729bd WHIRLPOOL f9dfc3ef37356c1683ba6d76a4ecffc04f166b551d87c8421c940d2d637ae10ff4f2a8df473b8eec012319c001097bae719902a1b315933d1877f02e17100c76
+DIST ffmpeg-0.10.11.tar.bz2 5786390 SHA256 99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0 SHA512 c013b1f9fce764302db924ec057e1cb8df132dc55173476e77cf254e43c10d13124a9ce5c063eb586146de92620b6b88cad8a5198a1d30a4a9c6611a83e515e6 WHIRLPOOL f1f1589328af7594025fe44ecdff7d7b1edb2c88584ab737e719a3e2fa5cc0f94b65e6c645a22f6c474041b6404acf37740d24101c8e2bd9912112171695d22b
 DIST ffmpeg-0.10.9.tar.bz2 5783502 SHA256 1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9 SHA512 216c006def3952881129160b3f70b270287dcae568bb6f39c77552023e5c1eeb841e0b2ba181a7b188c8c9b1568b7b3167a827fd512c9ad82e8dc6f9ef8a61a2 WHIRLPOOL 159312de1231128e283571e61c1134df3b0345b822cc2e4178118efb564b48db5a175ca07a8de5dd2e4a07c2081b2106b3abb15da5f830b0ee10f3ed14b25bc0
 DIST ffmpeg-1.0.7.tar.bz2 6451535 SHA256 f7e52bd5e0de064e36ecb04adf155c31dd30366a13168fabe61fd135f24d5c11 SHA512 a3a756fe50773551de58113de7b848f6ccb21ed2cf5c5f04387694937152ae978639aa92e4207cc09f384f34093ad2e6ddf7dfb334097f20f1326e13748f57d5 WHIRLPOOL ba2cc60a7bd7de1dca7f6c9ed02874db0f711c273d9616c5eeda0ee2b33fa9e36f55eb812d75e24583f81098505635ccff018b7aea67dbe9b3fd18583042fb73
 DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
diff --git a/media-video/ffmpeg/ffmpeg-0.10.11.ebuild b/media-video/ffmpeg/ffmpeg-0.10.11.ebuild
new file mode 100644
index 000000000000..51d52421003c
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.10.11.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.11.ebuild,v 1.1 2014/01/19 13:48:27 aballier Exp $
+
+EAPI="5"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} multilib-minimal
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0.10"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+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
+	"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+DOCS=""
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	cdio? ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
+	dirac? ( media-video/dirac[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
+		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
+		amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
+		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
+		vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+	)
+	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] )
+	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
+	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
+	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!<media-video/ffmpeg-1.2
+	!<media-video/libav-9
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+# !media-libs/libpostproc
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( virtual/pkgconfig )
+	doc? ( app-text/texi2html )
+	gnutls? ( virtual/pkgconfig )
+	ieee1394? ( virtual/pkgconfig )
+	libv4l? ( virtual/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
+	truetype? ( virtual/pkgconfig )
+	v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	test? ( encode zlib )"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	ewarn "This version is _terribly_ outdated with known security issues and"
+	ewarn "bugs. It is provided only for binary compatibility."
+	ewarn "Use at your own risks."
+}
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch "${FILESDIR}/freiordl.patch"
+	epatch "${FILESDIR}/flashtest.patch"
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			configure libavdevice/libcdio.c || die
+	fi
+
+	epatch "${FILESDIR}"/${PN}-0.10.10-freetype251.patch
+}
+
+multilib_src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+	# Set to --enable-version3 if (L)GPL-3 is required
+	local version3=""
+
+	# enabled by default
+	for i in debug doc network vaapi vdpau zlib; do
+		use ${i} || myconf="${myconf} --disable-${i}"
+	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
+
+	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
+	for i in gnutls ; do
+		use $i && myconf="${myconf} --enable-$i"
+	done
+
+	# Encoders
+	if use encode
+	then
+		use mp3 && myconf="${myconf} --enable-libmp3lame"
+		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
+		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
+		for i in theora vorbis x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
+		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
+		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use cdio && myconf="${myconf} --enable-libcdio"
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+	use pulseaudio && myconf="${myconf} --enable-libpulse"
+	use libv4l && myconf="${myconf} --enable-libv4l2"
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf="${myconf} --enable-frei0r"
+	use truetype && myconf="${myconf} --enable-libfreetype"
+	use libass && myconf="${myconf} --enable-libass"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf="${myconf} --enable-pthreads"
+
+	# Decoders
+	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
+	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
+	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+	done
+	if use pic ; then
+		myconf="${myconf} --enable-pic"
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86* ]] && myconf="${myconf} --disable-asm"
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	# Mandatory configuration
+	myconf="
+		--enable-gpl
+		${version3}
+		--enable-avfilter
+		--disable-stripping
+		${myconf}"
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf="${myconf} --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf="${myconf} --target-os=mingw32"
+				;;
+			*linux*)
+				myconf="${myconf} --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	"${S}"/configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--disable-static \
+		--disable-{ffplay,ffmpeg,ffprobe,ffserver} \
+		--disable-{swresample,postproc,swscale,avdevice} \
+		${myconf} || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-libs
+	rm -f "${ED}"/usr/$(get_libdir)/*.so
+}
diff --git a/media-video/gpac/gpac-0.5.0-r1.ebuild b/media-video/gpac/gpac-0.5.0-r1.ebuild
index 976305840e06..f2de423d6329 100644
--- a/media-video/gpac/gpac-0.5.0-r1.ebuild
+++ b/media-video/gpac/gpac-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0-r1.ebuild,v 1.6 2014/01/18 20:13:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0-r1.ebuild,v 1.7 2014/01/19 10:25:40 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid"
 
 S="${WORKDIR}"/${PN}
diff --git a/media-video/mediainfo/mediainfo-0.7.65.ebuild b/media-video/mediainfo/mediainfo-0.7.65.ebuild
index a8c89b704f1c..e70652095254 100644
--- a/media-video/mediainfo/mediainfo-0.7.65.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.65.ebuild,v 1.1 2013/11/23 23:02:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.65.ebuild,v 1.2 2014/01/19 16:51:10 pacho Exp $
 
 EAPI=5
 WX_GTK_VER="2.8"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/parole/parole-0.5.2.ebuild b/media-video/parole/parole-0.5.2.ebuild
index 9ef4bb2238ae..8eb07176a8cd 100644
--- a/media-video/parole/parole-0.5.2.ebuild
+++ b/media-video/parole/parole-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.5.2.ebuild,v 1.1 2013/07/25 12:33:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.5.2.ebuild,v 1.2 2014/01/19 19:06:55 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips ~x86"
 IUSE="debug libnotify taglib"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index d6dd5b188f78..a466ce7a7e33 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.5 2014/01/14 15:32:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.6 2014/01/19 10:29:23 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls polarssl ssl"
 
 DEPEND="ssl? (
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index be95c9f1dbd6..8c10be4ae95c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2014 07:37:01 +0000
+Mon, 20 Jan 2014 10:37:03 +0000
diff --git a/metadata/glsa/glsa-201209-24.xml b/metadata/glsa/glsa-201209-24.xml
index 97a9019af586..0c2b6590e34a 100644
--- a/metadata/glsa/glsa-201209-24.xml
+++ b/metadata/glsa/glsa-201209-24.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">PostgreSQL</product>
   <announced>September 28, 2012</announced>
-  <revised>September 28, 2012: 1</revised>
+  <revised>January 20, 2014: 2</revised>
   <bug>406037</bug>
   <bug>419727</bug>
   <bug>431766</bug>
@@ -21,6 +21,16 @@
       <unaffected range="rge">9.0.9</unaffected>
       <unaffected range="rge">8.4.13</unaffected>
       <unaffected range="rge">8.3.20</unaffected>
+      <unaffected range="rge">8.4.17</unaffected>
+      <unaffected range="rge">8.4.19</unaffected>
+      <unaffected range="rge">9.0.13</unaffected>
+      <unaffected range="rge">9.0.14</unaffected>
+      <unaffected range="rge">9.0.15</unaffected>
+      <unaffected range="rge">8.4.14</unaffected>
+      <unaffected range="rge">8.4.15</unaffected>
+      <unaffected range="rge">8.4.16</unaffected>
+      <unaffected range="rge">9.0.16</unaffected>
+      <unaffected range="rge">9.0.17</unaffected>
       <vulnerable range="lt">9.1.5</vulnerable>
     </package>
   </affected>
@@ -90,5 +100,5 @@
   <metadata tag="requester" timestamp="Sun, 08 Apr 2012 15:26:13 +0000">
     underling
   </metadata>
-  <metadata tag="submitter" timestamp="Fri, 28 Sep 2012 11:27:50 +0000">ackle</metadata>
+  <metadata tag="submitter" timestamp="Mon, 20 Jan 2014 09:36:28 +0000">ackle</metadata>
 </glsa>
diff --git a/metadata/glsa/glsa-201401-10.xml b/metadata/glsa/glsa-201401-10.xml
new file mode 100644
index 000000000000..0607eecbe077
--- /dev/null
+++ b/metadata/glsa/glsa-201401-10.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201401-10">
+  <title>libexif, exif: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libexif and exif, some
+    of which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">libexif</product>
+  <announced>January 19, 2014</announced>
+  <revised>January 19, 2014: 1</revised>
+  <bug>426366</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/libexif" auto="yes" arch="*">
+      <unaffected range="ge">0.6.21</unaffected>
+      <vulnerable range="lt">0.6.21</vulnerable>
+    </package>
+    <package name="media-gfx/exif" auto="yes" arch="*">
+      <unaffected range="ge">0.6.21</unaffected>
+      <vulnerable range="lt">0.6.21</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libexif is a library for parsing, editing and saving Exif metadata from
+      images. exif is a small command line interface for libexif.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libexif and exif.
+      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 image
+      file using exif or an application linked against libexif, 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 libexif users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/libexif-0.6.21"
+    </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>
+    
+    <p>All exif users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-gfx/exif-0.6.21"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2812">CVE-2012-2812</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2813">CVE-2012-2813</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2814">CVE-2012-2814</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2836">CVE-2012-2836</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2837">CVE-2012-2837</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2840">CVE-2012-2840</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2841">CVE-2012-2841</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2845">CVE-2012-2845</uri>
+  </references>
+  <metadata tag="requester" timestamp="Sun, 22 Jul 2012 17:42:17 +0000">ackle</metadata>
+  <metadata tag="submitter" timestamp="Sun, 19 Jan 2014 15:10:21 +0000">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201401-11.xml b/metadata/glsa/glsa-201401-11.xml
new file mode 100644
index 000000000000..1e62be165423
--- /dev/null
+++ b/metadata/glsa/glsa-201401-11.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201401-11">
+  <title>Perl, Locale Maketext Perl module: Multiple vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Perl and
+    Locale::Maketext Perl module, the worst of which could allow a
+    context-dependent attacker to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">perl</product>
+  <announced>January 19, 2014</announced>
+  <revised>January 19, 2014: 1</revised>
+  <bug>384887</bug>
+  <bug>448632</bug>
+  <bug>460444</bug>
+  <bug>483448</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="dev-lang/perl" auto="yes" arch="*">
+      <unaffected range="ge">5.16.3</unaffected>
+      <vulnerable range="lt">5.16.3</vulnerable>
+    </package>
+    <package name="perl-core/locale-maketext" auto="yes" arch="*">
+      <unaffected range="ge">1.230.0</unaffected>
+      <vulnerable range="lt">1.230.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Perl is Larry Wall’s Practical Extraction and Report Language.
+      Locale::Maketext is a Perl module - framework for localization.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Perl and
+      Locale::Maketext Perl module. Please review the CVE identifiers
+      referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A context-dependent attacker could possibly execute arbitrary code with
+      the privileges of the process or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Perl users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/perl-5.16.3"
+    </code>
+    
+    <p>All Locale::Maketext users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=perl-core/locale-maketext-1.230.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2728">CVE-2011-2728</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2939">CVE-2011-2939</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5195">CVE-2012-5195
+    </uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-1667">CVE-2013-1667</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 19 Dec 2013 14:48:00 +0000">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="Sun, 19 Jan 2014 16:14:53 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201401-12.xml b/metadata/glsa/glsa-201401-12.xml
new file mode 100644
index 000000000000..19308f8620c4
--- /dev/null
+++ b/metadata/glsa/glsa-201401-12.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201401-12">
+  <title>GNUstep Base library: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in GNUstep Base library,
+    the worst of which allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">gnustep-base</product>
+  <announced>January 20, 2014</announced>
+  <revised>January 20, 2014: 1</revised>
+  <bug>325577</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="gnustep-base/gnustep-base" auto="yes" arch="*">
+      <unaffected range="ge">1.20.1</unaffected>
+      <vulnerable range="lt">1.20.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>GNUstep Base library is a free software package implementing the API of
+      the OpenStep Foundation Kit (tm), including later additions.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in GNUstep Base library.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A context-dependent attacker could possibly execute arbitrary code. A
+      local attacker could possibly read arbitrary files.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All GNUstep Base library users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=gnustep-base/gnustep-base-1.20.1"
+    </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>
+    
+    <p>NOTE: This is a legacy GLSA. Updates for all affected architectures are
+      available since August 13, 2010. It is likely that your system is already
+      no longer affected by this issue.
+    </p>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1457">CVE-2010-1457</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-1620">CVE-2010-1620</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 07 Oct 2011 23:37:30 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Mon, 20 Jan 2014 08:51:59 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201401-13.xml b/metadata/glsa/glsa-201401-13.xml
new file mode 100644
index 000000000000..36c264d6eac3
--- /dev/null
+++ b/metadata/glsa/glsa-201401-13.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201401-13">
+  <title>VirtualBox: Multiple Vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in VirtualBox, allowing
+    local attackers to escalate their privileges or cause a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">virtualbox</product>
+  <announced>January 20, 2014</announced>
+  <revised>January 20, 2014: 1</revised>
+  <bug>434872</bug>
+  <bug>498166</bug>
+  <access>local</access>
+  <affected>
+    <package name="app-emulation/virtualbox" auto="yes" arch="*">
+      <unaffected range="ge">4.2.22</unaffected>
+      <vulnerable range="lt">4.2.22</vulnerable>
+    </package>
+    <package name="app-emulation/virtualbox-bin" auto="yes" arch="*">
+      <unaffected range="ge">4.2.22</unaffected>
+      <vulnerable range="lt">4.2.22</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>VirtualBox is a powerful virtualization product from Oracle.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Virtualbox. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A local attacker in a guest virtual machine may be able to escalate
+      privileges or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All virtualbox users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/virtualbox-4.2.22"
+    </code>
+    
+    <p>All virtualbox-bin users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/virtualbox-bin-4.2.22"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3221">CVE-2012-3221</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-5892">CVE-2013-5892</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0404">CVE-2014-0404</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0405">CVE-2014-0405</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0406">CVE-2014-0406</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0407">CVE-2014-0407</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 20 Sep 2012 23:38:57 +0000">
+    underling
+  </metadata>
+  <metadata tag="submitter" timestamp="Mon, 20 Jan 2014 08:52:54 +0000">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index be95c9f1dbd6..8c10be4ae95c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2014 07:37:01 +0000
+Mon, 20 Jan 2014 10:37:03 +0000
diff --git a/metadata/md5-cache/app-accessibility/brltty-4.5-r3 b/metadata/md5-cache/app-accessibility/brltty-4.5-r3
index 4ded6921651f..08f398cdbfee 100644
--- a/metadata/md5-cache/app-accessibility/brltty-4.5-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-4.5-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
 EAPI=5
 HOMEPAGE=http://mielke.cc/brltty/
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech tcl X elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) python? ( >=dev-python/cython-0.16 ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.5.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=282dabbe2fbcf8dc6b1e1dae6c4185a8
+_md5_=285ec6a1332db4b0385634fbb5a571ea
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-0.4 b/metadata/md5-cache/app-accessibility/speechd-el-0.4
deleted file mode 100644
index 11418c20e61b..000000000000
--- a/metadata/md5-cache/app-accessibility/speechd-el-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=app-emacs/elib-1.0 app-accessibility/speech-dispatcher
-DESCRIPTION=emacs speech support
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-KEYWORDS=x86 ppc
-LICENSE=GPL-2
-RDEPEND=>=app-emacs/elib-1.0 app-accessibility/speech-dispatcher
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-0.4.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27
-_md5_=2758a895381fef14ff5be2bd967d7c54
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.2 b/metadata/md5-cache/app-accessibility/speechd-el-2.2
deleted file mode 100644
index abbdaaad103e..000000000000
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=app-emacs/cedet-1.0_pre4-r2 >=app-accessibility/speech-dispatcher-0.5 >=virtual/emacs-21
-DESCRIPTION=Emacs speech support
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-KEYWORDS=~ppc x86
-LICENSE=GPL-3
-RDEPEND=>=app-emacs/cedet-1.0_pre4-r2 >=app-accessibility/speech-dispatcher-0.5 >=virtual/emacs-21
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.2.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=eb17798dc9efcc77321240a6d0ab4444
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.4 b/metadata/md5-cache/app-accessibility/speechd-el-2.4
deleted file mode 100644
index d002d7fe1f34..000000000000
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs speech support
-EAPI=4
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-IUSE=brltty
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.7 brltty? ( app-accessibility/brltty ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.4.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e1101d041fbd0148903faed90aefeb5a
diff --git a/metadata/md5-cache/app-admin/checkrestart-0.47-r2 b/metadata/md5-cache/app-admin/checkrestart-0.47-r2
index 2899fb38324c..d3110ca02cb2 100644
--- a/metadata/md5-cache/app-admin/checkrestart-0.47-r2
+++ b/metadata/md5-cache/app-admin/checkrestart-0.47-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=the sysadmin's rolling upgrade tool
 EAPI=4
 HOMEPAGE=http://arcdraco.net/checkrestart
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* sys-apps/lsb-release app-portage/portage-utils sys-process/lsof
 SLOT=0
 SRC_URI=http://arcdraco.net/~dragon/checkrestart-0.47-sep.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d03145a7793bcf86a49d18e2a1d3110a
+_md5_=0ee11d0f13c8a1e5805455e8465384a5
diff --git a/metadata/md5-cache/app-admin/eselect-bashcomp-1.3.6 b/metadata/md5-cache/app-admin/eselect-bashcomp-1.3.6
index a13b6d44ca38..1370070d4e92 100644
--- a/metadata/md5-cache/app-admin/eselect-bashcomp-1.3.6
+++ b/metadata/md5-cache/app-admin/eselect-bashcomp-1.3.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Manage contributed bash-completion scripts
 EAPI=4
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.3.8
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-1.3.6.tar.xz
-_md5_=e178d3cdd76051ba96c954dcef68f36e
+_md5_=c799fca387eefe275540d996439f38e2
diff --git a/metadata/md5-cache/app-admin/eselect-cdparanoia-0.1 b/metadata/md5-cache/app-admin/eselect-cdparanoia-0.1
index 96caede25919..80d9bf996fb3 100644
--- a/metadata/md5-cache/app-admin/eselect-cdparanoia-0.1
+++ b/metadata/md5-cache/app-admin/eselect-cdparanoia-0.1
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2
 DESCRIPTION=Manage /usr/bin/cdparanoia symlink
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
 SLOT=0
-_md5_=8018ff03c5c01019c89dc2f4ab1cead7
+_md5_=344b08b574741214f3b02618d1793f69
diff --git a/metadata/md5-cache/app-admin/eselect-postgresql-1.2.1 b/metadata/md5-cache/app-admin/eselect-postgresql-1.2.1
index b44353ac31e6..d2aa8d351e65 100644
--- a/metadata/md5-cache/app-admin/eselect-postgresql-1.2.1
+++ b/metadata/md5-cache/app-admin/eselect-postgresql-1.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~titanofold/eselect-postgresql-1.2.1.tbz2
-_md5_=c8d1dbfa467cbec8e724180bb1cb2509
+_md5_=3fbbdb273559414cbbfcb2e5e84bd8db
diff --git a/metadata/md5-cache/app-admin/eselect-python-20140115 b/metadata/md5-cache/app-admin/eselect-python-20140115
index bdfd41361e93..fd23de80e5d9 100644
--- a/metadata/md5-cache/app-admin/eselect-python-20140115
+++ b/metadata/md5-cache/app-admin/eselect-python-20140115
@@ -6,4 +6,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-python-20140115.tar.bz2 http://dev.gentoo.org/~floppym/dist/eselect-python-20140115.tar.bz2
-_md5_=9b232bbd4dcee0f3f1bd3000bb9f28ea
+_md5_=3996121788ee715dff150f5767d9e230
diff --git a/metadata/md5-cache/app-admin/eselect-python-99999999 b/metadata/md5-cache/app-admin/eselect-python-99999999
index 04845ab4353e..7cbacf203d9e 100644
--- a/metadata/md5-cache/app-admin/eselect-python-99999999
+++ b/metadata/md5-cache/app-admin/eselect-python-99999999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst unpack
-DEPEND=sys-devel/autoconf !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.8.2.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Eselect module for management of multiple Python versions
 HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6a9bea4b63816a1860d3cc6b1f6a7ef6
+_md5_=8bc4d2956fd7042f7eec65964f12ce25
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.10-r1 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.10-r1
index 634d83d50c14..62d68f0e3cff 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.10-r1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.0.10/haskell-updater-1.2.0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dcde0fc154e70a4e0a63e248975a0884
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.11 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.11
index a1c4924da1c0..06b40c3ac251 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.11
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=http://code.haskell.org/~slyfox/haskell-updater-1.2.0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b82d6dc7547a171e5cdd559326a6abbc
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.12 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.12
index 7e0f6292a55e..9144a31f4555 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.12
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.0.12/haskell-updater-1.2.0.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a633cc4f30d8f176b01154374f830f8e
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
index c1b028c36653..6c52138a21ec 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.0.9/haskell-updater-1.2.0.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=891875a2da00483c76d754e0855c8ab9
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.1 b/metadata/md5-cache/app-admin/haskell-updater-1.2.1
index 389ec7e856ee..324f55928e96 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.1/haskell-updater-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8408287628cc7a063144c4df1d6709c2
diff --git a/metadata/md5-cache/app-admin/lib_users-0.5 b/metadata/md5-cache/app-admin/lib_users-0.5
deleted file mode 100644
index 7757a019379a..000000000000
--- a/metadata/md5-cache/app-admin/lib_users-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup test
-DEPEND=test? ( dev-python/nose ) =dev-lang/python-2*
-DESCRIPTION=Checks /proc for libraries being mapped but marked as deleted
-EAPI=3
-HOMEPAGE=http://schwarzvogel.de/software-misc.shtml
-IUSE=test
-KEYWORDS=alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.5.tar.gz
-_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=369d4f38c03a11f9ae33b5d87646ed58
diff --git a/metadata/md5-cache/app-admin/lib_users-0.6 b/metadata/md5-cache/app-admin/lib_users-0.6
deleted file mode 100644
index a6518e9b199c..000000000000
--- a/metadata/md5-cache/app-admin/lib_users-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup test
-DEPEND=test? ( dev-python/nose )
-DESCRIPTION=Checks /proc for libraries being mapped but marked as deleted
-EAPI=5
-HOMEPAGE=http://schwarzvogel.de/software-misc.shtml
-IUSE=test
-KEYWORDS=alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.6.tar.gz
-_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e9fec4a63e79d40fc9469e0a69bb335f
diff --git a/metadata/md5-cache/app-admin/python-updater-0.10 b/metadata/md5-cache/app-admin/python-updater-0.10
deleted file mode 100644
index 0b8fd6c1cf2b..000000000000
--- a/metadata/md5-cache/app-admin/python-updater-0.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Script used to reinstall Python packages after changing of active Python versions
-HOMEPAGE=http://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
-SLOT=0
-SRC_URI=http://people.apache.org/~Arfrever/gentoo/python-updater-0.10.tar.bz2
-_md5_=c07fae21349cc8d1fae296be252f1189
diff --git a/metadata/md5-cache/app-admin/python-updater-0.10-r2 b/metadata/md5-cache/app-admin/python-updater-0.10-r2
deleted file mode 100644
index 670b78d927cf..000000000000
--- a/metadata/md5-cache/app-admin/python-updater-0.10-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Script used to reinstall Python packages after changing of active Python versions
-HOMEPAGE=http://www.gentoo.org/proj/en/Python/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
-SLOT=0
-SRC_URI=http://people.apache.org/~Arfrever/gentoo/python-updater-0.10.tar.bz2
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a4ae8ddb3fd95a854679d29ceb216c00
diff --git a/metadata/md5-cache/app-admin/python-updater-0.11 b/metadata/md5-cache/app-admin/python-updater-0.11
index 6a1e580026bb..2dc25f8c3e13 100644
--- a/metadata/md5-cache/app-admin/python-updater-0.11
+++ b/metadata/md5-cache/app-admin/python-updater-0.11
@@ -4,7 +4,7 @@ EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
+RDEPEND=|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~floppym/dist/python-updater-0.11.tar.bz2
-_md5_=bb9838fb8a8de984fdbd11b10d23947d
+_md5_=5c88381d50ee970b1aa3b3bce66e0fca
diff --git a/metadata/md5-cache/app-admin/python-updater-9999 b/metadata/md5-cache/app-admin/python-updater-9999
index f0301a6e5479..f9ac20f433e0 100644
--- a/metadata/md5-cache/app-admin/python-updater-9999
+++ b/metadata/md5-cache/app-admin/python-updater-9999
@@ -4,7 +4,7 @@ DESCRIPTION=Script used to reinstall Python packages after changing of active Py
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
-RDEPEND=dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
+RDEPEND=|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
 SLOT=0
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=11ec554cac06e1d4c4c7e0c7cfc9cdd0
+_md5_=f5fc8272f7c27ecc9d88e6dfb3848fb1
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r3 b/metadata/md5-cache/app-admin/setools-3.3.8-r3
new file mode 100644
index 000000000000..cf66a57f4c8f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( dev-lang/swig:1 >=virtual/jdk-1.4 ) python? ( dev-lang/swig:1 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+DESCRIPTION=SELinux policy tools
+EAPI=2
+HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
+IUSE=X debug java python elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-2.1.4 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 java? ( >=virtual/jre-1.4 ) X? ( >=dev-lang/tk-8.4.9 >=dev-tcltk/bwidget-1.8 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( dev-lang/python )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-02-gentoo-patches.tar.gz
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=50c164cb1571dd5db679b6e8d29a86ed
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.10 b/metadata/md5-cache/app-arch/dpkg-1.16.10
deleted file mode 100644
index b366e984c37a..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.16.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Package maintenance system for Debian
-EAPI=4
-HOMEPAGE=http://packages.qa.debian.org/dpkg
-IUSE=bzip2 dselect nls test unicode zlib linguas_ast linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mr linguas_nb linguas_ne linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_sk linguas_sv linguas_th linguas_tl linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
-REQUIRED_USE=dselect? ( nls )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.10.tar.xz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1267e0c23e2f6302d6f17f2e6c9863bb
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.11 b/metadata/md5-cache/app-arch/dpkg-1.16.11
deleted file mode 100644
index 7bb731df8b2f..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.16.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) app-arch/xz-utils nls? ( app-text/po4a ) sys-devel/flex virtual/pkgconfig test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Package maintenance system for Debian
-EAPI=4
-HOMEPAGE=http://packages.qa.debian.org/dpkg
-IUSE=bzip2 dselect nls test unicode zlib linguas_ast linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_mr linguas_nb linguas_ne linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_sk linguas_sv linguas_th linguas_tl linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
-REQUIRED_USE=dselect? ( nls )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.11.tar.xz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=643a68b17339ddb0162bf1186043aa7e
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.3-r1 b/metadata/md5-cache/app-arch/lbzip2-2.3-r1
index 36a75173352d..a659202e370b 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.3-r1
+++ b/metadata/md5-cache/app-arch/lbzip2-2.3-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Parallel bzip2 utility
 EAPI=5
 HOMEPAGE=https://github.com/kjn/lbzip2/
 IUSE=debug symlink
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
 SLOT=0
 SRC_URI=http://archive.lbzip2.org/lbzip2-2.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dbb4344f765f665c942465bcf0d4f1c2
+_md5_=5943af2d58be965350093dcd95916d70
diff --git a/metadata/md5-cache/app-arch/lzip-1.15 b/metadata/md5-cache/app-arch/lzip-1.15
index 331727a31a1e..d54048cc10e4 100644
--- a/metadata/md5-cache/app-arch/lzip-1.15
+++ b/metadata/md5-cache/app-arch/lzip-1.15
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=lossless data compressor based on the LZMA algorithm
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
-KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.15.tar.gz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3665b2a624e2d6366039406446c1236b
+_md5_=76f650b65e4d3c0f65ebff104aac4fd5
diff --git a/metadata/md5-cache/app-cdr/cdemu-2.1.1 b/metadata/md5-cache/app-cdr/cdemu-2.1.1
index c5bbedc8b53b..152cbd0ccc5b 100644
--- a/metadata/md5-cache/app-cdr/cdemu-2.1.1
+++ b/metadata/md5-cache/app-cdr/cdemu-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tool for controlling cdemu-daemon
 EAPI=5
 HOMEPAGE=http://cdemu.org
 IUSE=+cdemu-daemon linguas_de linguas_fr linguas_no linguas_pl linguas_sl linguas_sv python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/cdemu-client-2.1.1.tar.bz2
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bcab36b92fef862dd4e37d87f3bb3e9b
+_md5_=dce50ee33063dd248b958dc54dfa0820
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-2.1.1 b/metadata/md5-cache/app-cdr/cdemu-daemon-2.1.1
index 198483aa77ad..6c2c0f7b81ea 100644
--- a/metadata/md5-cache/app-cdr/cdemu-daemon-2.1.1
+++ b/metadata/md5-cache/app-cdr/cdemu-daemon-2.1.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-2.1.1:= >=media-libs/libao-0.
 DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
 EAPI=5
 HOMEPAGE=http://cdemu.org
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-2.1.1:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
 SLOT=0/6
 SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-2.1.1.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a2102636b8e2d7b8171f36c75c7506b1
+_md5_=8d9b039e808f7f4d4eed5bcd416cc52d
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha21 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha21
index d468f11674e2..639056f3327e 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha21
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha21
@@ -10,4 +10,4 @@ RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) !app-cdr/cdrkit
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/cdrecord/alpha//cdrtools-3.01a21.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8c3771dbffff4739a60ecd117c0988bf
+_md5_=77a3c036ab293afb0892c47e9ff26426
diff --git a/metadata/md5-cache/app-cdr/gcdemu-2.1.1 b/metadata/md5-cache/app-cdr/gcdemu-2.1.1
index 2f10e4317e8a..07aa66d84687 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-2.1.1
+++ b/metadata/md5-cache/app-cdr/gcdemu-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
 EAPI=5
 HOMEPAGE=http://cdemu.org/
 IUSE=debug linguas_de linguas_fr linguas_no linguas_pl linguas_sl linguas_zh_CN python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-cdr/cdemu-daemon:0/6 >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] gnome-base/librsvg:2 sys-apps/dbus x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/gcdemu-2.1.1.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f09b7ddb91d378715be1b0d0b40f51fb
+_md5_=8b590b22beedf0e6051b4cf2cd7a49be
diff --git a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0 b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
index fc71c12c817b..83581bd8c917 100644
--- a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
+++ b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Brazilian dictionaries for myspell/hunspell
 EAPI=4
 HOMEPAGE=http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/
-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=LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=http://pt-br.libreoffice.org/assets/VeroptBRV300AOG.oxt http://wiki.documentfoundation.org/images/f/ff/DicSin-BR.oxt -> myspell-pt-br-3.0.0-thes.oxt
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	myspell-r2	003136484d2902411a2a4841efcda076	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=be2a9029b76e8e47004fbae4ad6b7e21
+_md5_=a1510fdf1fa795d351a2849039a12a98
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999 b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
index dab320eb516c..b71e4fbfa7d2 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
@@ -4,10 +4,9 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) 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:0= ) 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	bzr	8b59c16d7183cb93649d7abe70dc4c85	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7280d81029545f1ca2ecd703cc59d5f9
+_md5_=5babbea2825cfc020a1995e0757fb986
diff --git a/metadata/md5-cache/app-editors/joe-3.7-r2 b/metadata/md5-cache/app-editors/joe-3.7-r2
index 83bd451da1e5..aa6f942b8473 100644
--- a/metadata/md5-cache/app-editors/joe-3.7-r2
+++ b/metadata/md5-cache/app-editors/joe-3.7-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
 EAPI=3
 HOMEPAGE=http://sourceforge.net/projects/joe-editor/
 IUSE=xterm
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-1
 RDEPEND=xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-3.7.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=88e77dfdc500f378db3d3004a02a8cf0
+_md5_=f72ed2239640b8fdeae059b7beb7ddd4
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r4 b/metadata/md5-cache/app-editors/nvi-1.81.6-r4
index cf9e856e66a1..22a5bd4f448e 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r4
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Vi clone
 EAPI=4
 HOMEPAGE=https://sites.google.com/a/bostic.com/keithbostic/vi
 IUSE=perl tcl unicode
-KEYWORDS=alpha amd64 hppa ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 ~sparc x86
 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
 REQUIRED_USE=tcl? ( !unicode )
 SLOT=0
 SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	db-use	1c719875d6599536f956fafea9e1f404	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=51f0f22e3e7050ab49d2abf2e46fd0ae
+_md5_=da281c456ee97c0d3e14428b9e68bdce
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.5.6 b/metadata/md5-cache/app-emulation/libvirt-1.0.5.6
deleted file mode 100644
index 0ff994c009c8..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-libs/libxslt dev-lang/perl =dev-lang/python-2* python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=5
-HOMEPAGE=http://www.libvirt.org/
-IUSE=audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit python +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/stable_updates/libvirt-1.0.5.6.tar.gz ftp://libvirt.org/libvirt/stable_updates/libvirt-1.0.5.6.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	305197b0aa1194fa3ef67ca21f6faa7e	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d4f2b195e9437b10be2de02416006aff
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.3-r2 b/metadata/md5-cache/app-emulation/libvirt-1.1.3-r2
deleted file mode 100644
index a8db5ec2e205..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-1.1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-lang/perl dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=5
-HOMEPAGE=http://www.libvirt.org/
-IUSE=audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit python +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
-REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/libvirt-1.1.3.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.3.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.1.3-062ad8b2.tar.xz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0cdbafc11d02195c82c4026f4cdc6170
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.4 b/metadata/md5-cache/app-emulation/libvirt-1.1.3.3
similarity index 96%
rename from metadata/md5-cache/app-emulation/libvirt-1.1.4
rename to metadata/md5-cache/app-emulation/libvirt-1.1.3.3
index 11ef76c4fda3..082d737e2624 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.1.4
+++ b/metadata/md5-cache/app-emulation/libvirt-1.1.3.3
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
-SRC_URI=http://libvirt.org/sources/libvirt-1.1.4.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.4.tar.gz
+SRC_URI=http://libvirt.org/sources/stable_updates/libvirt-1.1.3.3.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.3.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1a937bf4b15afc11233dc99cbcf49ad1
+_md5_=b757bf2bbb47a996c8e2d555c9b8e32b
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.2.0 b/metadata/md5-cache/app-emulation/libvirt-1.2.1
similarity index 96%
rename from metadata/md5-cache/app-emulation/libvirt-1.2.0
rename to metadata/md5-cache/app-emulation/libvirt-1.2.1
index ddb88d83a50b..6cca0ff68b08 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.0
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.1
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
-SLOT=0/1.2.0
-SRC_URI=http://libvirt.org/sources/libvirt-1.2.0.tar.gz ftp://libvirt.org/libvirt/libvirt-1.2.0.tar.gz
+SLOT=0/1.2.1
+SRC_URI=http://libvirt.org/sources/libvirt-1.2.1.tar.gz ftp://libvirt.org/libvirt/libvirt-1.2.1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fc5bb4eafda724d29d0521238ebfe220
+_md5_=befc98073fe83db726b522fa9466e260
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-2013.09.16.1328054-r2 b/metadata/md5-cache/app-emulation/open-vm-tools-2013.09.16.1328054-r2
new file mode 100644
index 000000000000..8778c57b30b0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2013.09.16.1328054-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps pam? ( 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 ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils virtual/pkgconfig
+DESCRIPTION=Opensourced tools for VMware guests
+EAPI=5
+HOMEPAGE=http://open-vm-tools.sourceforge.net/
+IUSE=X doc fuse icu modules pam +pic xinerama
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps pam? ( 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 ) modules? ( app-emulation/open-vm-tools-kmod )
+SLOT=0
+SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2013.09.16-1328054.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=95f572680bcad28f0e6bc9174c7d9a0f
diff --git a/metadata/md5-cache/app-emulation/qemu-1.5.2-r1 b/metadata/md5-cache/app-emulation/qemu-1.5.2-r1
deleted file mode 100644
index cacf10afba06..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-1.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 <sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=5
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs gtk iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_6 python_targets_python2_7 +filecaps
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 <sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
-REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
-SLOT=0
-SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.2-e26b4ba6.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8e624f48caf1a7a5a2caff7fc19e7ea6
diff --git a/metadata/md5-cache/app-emulation/qemu-1.5.2-r2 b/metadata/md5-cache/app-emulation/qemu-1.5.2-r2
deleted file mode 100644
index 7c5797a76d36..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-1.5.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 <sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=5
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs gtk iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_6 python_targets_python2_7 +filecaps
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 <sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
-REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
-SLOT=0
-SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.2-fd9f079c.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=415f323dbe23e1e6be52e0be829c302e
diff --git a/metadata/md5-cache/app-emulation/qemu-1.6.0 b/metadata/md5-cache/app-emulation/qemu-1.6.0
deleted file mode 100644
index 2f73c2da0f14..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=5
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs gtk iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_6 python_targets_python2_7 +filecaps
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
-REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
-SLOT=0
-SRC_URI=http://wiki.qemu-project.org/download/qemu-1.6.0.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.6.0-49bdd50f.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2b8a609be5fdaa67f8714d3c0077612a
diff --git a/metadata/md5-cache/app-emulation/qemu-1.7.0 b/metadata/md5-cache/app-emulation/qemu-1.7.0
index 4a4f07f8d6e9..8c8f3979bfb4 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.7.0
+++ b/metadata/md5-cache/app-emulation/qemu-1.7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusbx-1.0.13 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) usb? ( >=dev-libs/libusbx-1.0.13[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusbx-1.0.13 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) usb? ( >=dev-libs/libusbx-1.0.13[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=5
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs gtk iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_6 python_targets_python2_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusbx-1.0.13 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
+RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusbx-1.0.13 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses,readline] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
 REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.7.0.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=82b8de72cb6f97e6dd7104945fbe1642
+_md5_=9918e3b680d0ccd8e4b4ca9cb821d44c
diff --git a/metadata/md5-cache/app-misc/gentoo-0.19.13 b/metadata/md5-cache/app-misc/gentoo-0.19.13
deleted file mode 100644
index f40246cc38c5..000000000000
--- a/metadata/md5-cache/app-misc/gentoo-0.19.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A modern GTK+ based filemanager for any WM
-EAPI=4
-HOMEPAGE=http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/
-IUSE=nls
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/gentoo/gentoo-0.19.13.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1dfd0c11324fd3b694f9c164dadfe925
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.1 b/metadata/md5-cache/app-misc/gentoo-0.20.1
deleted file mode 100644
index 14fcfe4b41a9..000000000000
--- a/metadata/md5-cache/app-misc/gentoo-0.20.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A modern GTK+ based filemanager for any WM
-EAPI=5
-HOMEPAGE=http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/
-IUSE=nls
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.1.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9318937bda4dafadf7ed92f5ba1d7827
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.3 b/metadata/md5-cache/app-misc/gentoo-0.20.3
deleted file mode 100644
index 289cc68509f0..000000000000
--- a/metadata/md5-cache/app-misc/gentoo-0.20.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A modern GTK+ based filemanager for any WM
-EAPI=5
-HOMEPAGE=http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/
-IUSE=nls
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.3.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=11ce04303bd8b4156a1b7bc94e5efb9f
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.10-r1 b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
index 47af1abaa073..7f05388847ee 100644
--- a/metadata/md5-cache/app-misc/smtm-1.6.10-r1
+++ b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/perl-tk dev-perl/DateManip dev-perl/HTML-Parser dev-perl/Finance
 DESCRIPTION=Stock ticker, profit/loss calculator and chart tool
 EAPI=5
 HOMEPAGE=http://eddelbuettel.com/dirk/code/smtm.html
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=93faaed991ae1eb8e98eb1bb9ed7d789
+_md5_=1d96a9ce87638a39ad4843aac3a14c90
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.6 b/metadata/md5-cache/app-misc/smtm-1.6.6
deleted file mode 100644
index 3e559f50a076..000000000000
--- a/metadata/md5-cache/app-misc/smtm-1.6.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=>=dev-lang/perl-5 dev-perl/perl-tk dev-perl/DateManip dev-perl/HTML-Parser dev-perl/Finance-YahooQuote dev-perl/libwww-perl
-DESCRIPTION=Stock ticker, profit/loss calculator and chart tool
-HOMEPAGE=http://eddelbuettel.com/dirk/code/smtm.html
-KEYWORDS=ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5 dev-perl/perl-tk dev-perl/DateManip dev-perl/HTML-Parser dev-perl/Finance-YahooQuote dev-perl/libwww-perl
-SLOT=0
-SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.6.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-app	4c2027b6530baeab97482b706149e640	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2bb2d90e854d691311fac3822d1fad56
diff --git a/metadata/md5-cache/app-office/calligra-2.6.4 b/metadata/md5-cache/app-office/calligra-2.6.4
index 0e402c5c4042..b160307c5a87 100644
--- a/metadata/md5-cache/app-office/calligra-2.6.4
+++ b/metadata/md5-cache/app-office/calligra-2.6.4
@@ -1,5 +1,5 @@
 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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop(+)] dev-lang/perl dev-libs/boost dev-libs/libxml2 dev-libs/soprano >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) 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 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop(+)] dev-lang/perl dev-libs/boost dev-libs/libxml2 dev-libs/soprano >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) 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 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=5
 HOMEPAGE=http://www.calligra.org/
@@ -7,10 +7,10 @@ IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gs
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 PDEPEND=>=app-office/calligra-l10n-2.6
-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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop(+)] dev-lang/perl dev-libs/boost dev-libs/libxml2 dev-libs/soprano >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop(+)] dev-lang/perl dev-libs/boost dev-libs/libxml2 dev-libs/soprano >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.6.4/calligra-2.6.4.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=58d67155e5463527206af946c1136fb5
+_md5_=24c3af9536038ccd6858de5ffcb80675
diff --git a/metadata/md5-cache/app-office/calligra-2.7.5 b/metadata/md5-cache/app-office/calligra-2.7.5
index d47a048acb9d..8d9d628fda58 100644
--- a/metadata/md5-cache/app-office/calligra-2.7.5
+++ b/metadata/md5-cache/app-office/calligra-2.7.5
@@ -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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=5
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads +truetype vc word-perfect xbase +xml +xslt calligra_features_author 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 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 PDEPEND=>=app-office/calligra-l10n-2.7
-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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) kdepim? ( semantic-desktop ) vc? ( calligra_features_krita ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.7.5/calligra-2.7.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b254579829e559a764eeacc069e0d2a7
+_md5_=b37c4d0a3ca4230f09a9e713e2f5dd50
diff --git a/metadata/md5-cache/app-office/calligra-9999 b/metadata/md5-cache/app-office/calligra-9999
index 89699821b962..f3116d2d7118 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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.9 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=5
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr +pdf postgres semantic-desktop spacenav +ssl sybase test tiff +threads +truetype vc word-perfect xbase +xml +xslt calligra_features_author 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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=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 >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop?] dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=dev-qt/qtgui-4.8.1-r1:4 virtual/libiconv attica? ( dev-libs/libattica[qt4] ) 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 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kde? ( >=kde-base/kactivities-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) 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=] ) opengl? ( virtual/glu ) 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 ) spacenav? ( dev-libs/libspnav ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) vc? ( dev-libs/vc ) 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? ( >=dev-qt/qtopengl-4.8.1:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.1:4[accessibility] >=dev-qt/qtcore-4.8.1:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.1:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.1:4 >=dev-qt/qtsql-4.8.1:4[qt3support] >=dev-qt/qtsvg-4.8.1:4 >=dev-qt/qttest-4.8.1:4 >=dev-qt/qtwebkit-4.8.1:4 >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) kdepim? ( semantic-desktop ) vc? ( calligra_features_krita ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	git-r3	f089608c770d9ad72a2c92b547d2b20d	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=346ea9efff5b2001e5ad90e3e37bd862
+_md5_=4d6cf8755971337834c8d3d022d8a561
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.7.5 b/metadata/md5-cache/app-office/calligra-l10n-2.7.5
index 3082b500aeb5..4ee23223dc9f 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.7.5
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=Calligra localization package
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=doc linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_ia linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=!app-office/koffice-l10n >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_bs? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-bs-2.7.5.tar.xz ) linguas_ca? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-ca-2.7.5.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-ca@valencia-2.7.5.tar.xz ) linguas_cs? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-cs-2.7.5.tar.xz ) linguas_da? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-da-2.7.5.tar.xz ) linguas_de? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-de-2.7.5.tar.xz ) linguas_el? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-el-2.7.5.tar.xz ) linguas_es? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-es-2.7.5.tar.xz ) linguas_et? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-et-2.7.5.tar.xz ) linguas_fi? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-fi-2.7.5.tar.xz ) linguas_fr? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-fr-2.7.5.tar.xz ) linguas_gl? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-gl-2.7.5.tar.xz ) linguas_hu? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-hu-2.7.5.tar.xz ) linguas_ia? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-ia-2.7.5.tar.xz ) linguas_it? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-it-2.7.5.tar.xz ) linguas_kk? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-kk-2.7.5.tar.xz ) linguas_nb? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-nb-2.7.5.tar.xz ) linguas_nds? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-nds-2.7.5.tar.xz ) linguas_nl? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-nl-2.7.5.tar.xz ) linguas_pl? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-pl-2.7.5.tar.xz ) linguas_pt? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-pt-2.7.5.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-pt_BR-2.7.5.tar.xz ) linguas_ru? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-ru-2.7.5.tar.xz ) linguas_sk? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-sk-2.7.5.tar.xz ) linguas_sl? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-sl-2.7.5.tar.xz ) linguas_sv? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-sv-2.7.5.tar.xz ) linguas_tr? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-tr-2.7.5.tar.xz ) linguas_uk? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-uk-2.7.5.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-zh_CN-2.7.5.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.7.5/calligra-l10n//calligra-l10n-zh_TW-2.7.5.tar.xz )
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b205d728942a240f17123a3a1200b79c
+_md5_=5f2341508f0251bf6bc2e46716bf52e9
diff --git a/metadata/md5-cache/app-office/orage-4.10.0 b/metadata/md5-cache/app-office/orage-4.10.0
index e9eb25647e7d..acfb43cfc74c 100644
--- a/metadata/md5-cache/app-office/orage-4.10.0
+++ b/metadata/md5-cache/app-office/orage-4.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=A time managing application (and panel plug-in) for the Xfce desktop
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=berkdb dbus debug libnotify +xfce_plugins_clock
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2 berkdb? ( >=sys-libs/db-4 ) dbus? ( >=dev-libs/dbus-glib-0.100 ) libnotify? ( >=x11-libs/libnotify-0.7:= ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.10/orage-4.10.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=91ba653978b8aa079b3dc54ddd9ecc3c
+_md5_=1a1b5917aa8d2785a77f051e1f34d9a6
diff --git a/metadata/md5-cache/app-office/skrooge-1.8.0 b/metadata/md5-cache/app-office/skrooge-1.8.0
index 729e82ccb49e..e6d26da4467f 100644
--- a/metadata/md5-cache/app-office/skrooge-1.8.0
+++ b/metadata/md5-cache/app-office/skrooge-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=personal finances manager for KDE4, aiming at being simple and intui
 EAPI=5
 HOMEPAGE=http://www.skrooge.org/
 IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] app-crypt/qca:2 dev-db/sqlite:3 dev-libs/grantlee >=dev-libs/libofx-0.9.1 dev-qt/qtsql:4[sqlite] >=kde-base/kde-dev-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_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_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_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/skrooge/skrooge-1.8.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d37c68ed71d96e92bb096b475be103cf
+_md5_=24f9a44ab4e050af8d49707b576074f9
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.1.4 b/metadata/md5-cache/app-portage/fquery-0.2.1.4
index 95f06569b45f..094606a9f72f 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.1.4
+++ b/metadata/md5-cache/app-portage/fquery-0.2.1.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/fquery/0.2.1.4/fquery-0.2.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c5e4eefde5fc117e5b5f644d69484b89
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.2-r1 b/metadata/md5-cache/app-portage/metagen-0.6.2-r1
new file mode 100644
index 000000000000..2e80e685eba3
--- /dev/null
+++ b/metadata/md5-cache/app-portage/metagen-0.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~neurogeek/metagen_releases/metagen-0.6.2.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5481843376f54bd92fe6336e2ae0970c
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index 43e723457c63..2913441aa286 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -1,10 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=>=dev-python/jaxml-3.01 >=sys-apps/portage-2.1.9.42 =dev-lang/python-2* dev-vcs/git
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=metadata.xml generator for ebuilds
-EAPI=3
+EAPI=5
 HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
 LICENSE=GPL-2
-RDEPEND=>=dev-python/jaxml-3.01 >=sys-apps/portage-2.1.9.42 =dev-lang/python-2*
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=55dce0f152764fc8ee8c68c6a8b23bee
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=34636cba05b11964a307a3f058c26163
diff --git a/metadata/md5-cache/app-shells/bash-completion-1.3-r2 b/metadata/md5-cache/app-shells/bash-completion-1.3-r2
index d3164faa8bff..c2d63b5278b7 100644
--- a/metadata/md5-cache/app-shells/bash-completion-1.3-r2
+++ b/metadata/md5-cache/app-shells/bash-completion-1.3-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Programmable Completion for bash
 EAPI=3
 HOMEPAGE=http://bash-completion.alioth.debian.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 PDEPEND=app-shells/gentoo-bashcomp
 RDEPEND=|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 ) || ( >=app-shells/bash-3.2 app-shells/zsh ) sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://bash-completion.alioth.debian.org/files/bash-completion-1.3.tar.bz2
 _eclasses_=prefix	21058c21ca48453d771df15500873ede
-_md5_=66cf805ca9a38c161a265cbab3c5d05a
+_md5_=75fc2469d92f5c248fd48c2c409bb035
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.1 b/metadata/md5-cache/app-shells/bash-completion-2.1
index 64af794a26a3..84050e10c108 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.1
+++ b/metadata/md5-cache/app-shells/bash-completion-2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Programmable Completion for bash
 EAPI=5
 HOMEPAGE=http://bash-completion.alioth.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 PDEPEND=app-shells/gentoo-bashcomp
 RDEPEND=|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 ) || ( >=app-shells/bash-3.2 app-shells/zsh ) sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://bash-completion.alioth.debian.org/files/bash-completion-2.1.tar.bz2
 _eclasses_=prefix	21058c21ca48453d771df15500873ede
-_md5_=fa012aa90042182e2316da5583b87c05
+_md5_=b6a4e87aa60e8e486faf45537cefdf04
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.1-r1 b/metadata/md5-cache/app-shells/bash-completion-2.1-r1
index 7e7abcbd2cc0..3f1b1dc310f9 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.1-r1
+++ b/metadata/md5-cache/app-shells/bash-completion-2.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst test
 DESCRIPTION=Programmable Completion for bash
 EAPI=5
 HOMEPAGE=http://bash-completion.alioth.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-shells/bash-4.1 app-shells/zsh ) sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://bash-completion.alioth.debian.org/files/bash-completion-2.1.tar.bz2
-_md5_=2c4f0f349a0f31f51b6716db5d156353
+_md5_=ddb85c51797c5a7807f5dc1884fe9c58
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
index 89696f375720..b39847edd55d 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20121024
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash-completion
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-bashcomp-20121024.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e9485e588d58f615aa3e273b69e8013e
+_md5_=57fa72003de350366d5adf63b5a8de35
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20130804 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20130804
index a7726411e78b..260d1b6c6cf2 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20130804
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20130804
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-completion-2.1-r1
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-bashcomp-20130804-r1.tar.bz2
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=071b5616212e4efaf484f5a079aa4176
+_md5_=be067b94acdc0fb21142ef0412d1e182
diff --git a/metadata/md5-cache/app-shells/push-1.6 b/metadata/md5-cache/app-shells/push-1.6
index 3cf18ebc5b9e..03ce73890367 100644
--- a/metadata/md5-cache/app-shells/push-1.6
+++ b/metadata/md5-cache/app-shells/push-1.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args.
 EAPI=4
 HOMEPAGE=https://github.com/vaeth/push/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/vaeth/push/tarball/1.6 -> push-1.6.tar.gz
 _eclasses_=vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=a525d74880c23a425cc902b944e52be1
+_md5_=f9d4df0cd44cd94baec98430dc4e37a8
diff --git a/metadata/md5-cache/app-shells/tcsh-6.18.01-r2 b/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
index eba3a238d808..060274d0da34 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
+++ b/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
 EAPI=3
 HOMEPAGE=http://www.tcsh.org/
 IUSE=nls doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~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=BSD
 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	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c07064d7290f1cc8c4625e3a387f5f0f
+_md5_=348fbb11f2ea18a86e4875f248da89c3
diff --git a/metadata/md5-cache/app-text/discount-2.1.6-r1 b/metadata/md5-cache/app-text/discount-2.1.6-r1
index 8ab262b2290a..8e212ce53240 100644
--- a/metadata/md5-cache/app-text/discount-2.1.6-r1
+++ b/metadata/md5-cache/app-text/discount-2.1.6-r1
@@ -3,9 +3,9 @@ DESCRIPTION=An implementation of John Gruber's Markdown text to html language wr
 EAPI=5
 HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
 IUSE=minimal
-KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.6.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=aa70cf29f88083575e536329d91d0710
+_md5_=039d184ac8f6dee89a8a794007090b3c
diff --git a/metadata/md5-cache/app-text/highlight-3.16 b/metadata/md5-cache/app-text/highlight-3.16
index 49c5994ae359..a5f4667cd8b4 100644
--- a/metadata/md5-cache/app-text/highlight-3.16
+++ b/metadata/md5-cache/app-text/highlight-3.16
@@ -4,10 +4,10 @@ DESCRIPTION=converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-F
 EAPI=5
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt4
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=dev-lang/lua qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.16.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b6a59e7c00fe3a1571c3296b1ab9929f
+_md5_=e256a232ef98e1c4fb433d4fb788f12f
diff --git a/metadata/md5-cache/app-text/llpp-15 b/metadata/md5-cache/app-text/llpp-15
index 77e9e6cb675d..84ad025685e6 100644
--- a/metadata/md5-cache/app-text/llpp-15
+++ b/metadata/md5-cache/app-text/llpp-15
@@ -4,11 +4,11 @@ DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
 EAPI=5
 HOMEPAGE=http://repo.or.cz/w/llpp.git
 IUSE=+ocamlopt static
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=x11-misc/xsel !static? ( ~app-text/mupdf-1.2:= media-libs/openjpeg:0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=mirror://gentoo/llpp-15.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=6accf13cc694aface15dc9f93d9ee6ad
+_md5_=45afdbd03f3404f94502e5d4d3e2393f
diff --git a/metadata/md5-cache/app-text/mupdf-1.2 b/metadata/md5-cache/app-text/mupdf-1.2
index ef01b0116435..b20d4217e170 100644
--- a/metadata/md5-cache/app-text/mupdf-1.2
+++ b/metadata/md5-cache/app-text/mupdf-1.2
@@ -4,10 +4,10 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=5
 HOMEPAGE=http://mupdf.com/
 IUSE=X vanilla static static-libs
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] >=media-libs/openjpeg-1.5:0[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
 SLOT=0/1.2
 SRC_URI=http://mupdf.googlecode.com/files/mupdf-1.2-source.zip
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4bd8654c5c1cd5b57accbdf5c2a07671
+_md5_=8ef41d5e63acbb6d59e6cfa880e2f916
diff --git a/metadata/md5-cache/app-text/pandoc-1.11.1 b/metadata/md5-cache/app-text/pandoc-1.11.1
index 7cb640d9d609..b19f6d77b998 100644
--- a/metadata/md5-cache/app-text/pandoc-1.11.1
+++ b/metadata/md5-cache/app-text/pandoc-1.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.9:=[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.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[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.5:=[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.1.5:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.11.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.11.1/pandoc-1.11.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e8c1ede4f9f2fb5e3f75f8e1abec7477
diff --git a/metadata/md5-cache/app-text/pandoc-1.11.1-r1 b/metadata/md5-cache/app-text/pandoc-1.11.1-r1
index b72e9528dd51..2a21dc2f18bf 100644
--- a/metadata/md5-cache/app-text/pandoc-1.11.1-r1
+++ b/metadata/md5-cache/app-text/pandoc-1.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.9:=[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.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[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.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] =dev-haskell/temporary-1.1*:=[profile?] >=dev-haskell/texmath-0.6.1.5:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.11.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.11.1/pandoc-1.11.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=35b9545cd9cb3b098a67c7e3ae714424
diff --git a/metadata/md5-cache/app-text/pandoc-1.12 b/metadata/md5-cache/app-text/pandoc-1.12
index f0ca8a197be7..c2dc662365c7 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12
+++ b/metadata/md5-cache/app-text/pandoc-1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/stringable-0.1:=[profile?] <dev-haskell/stringable-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12/pandoc-1.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=781c534ebd37f3cb2c4fe73d948dc433
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.1 b/metadata/md5-cache/app-text/pandoc-1.12.1
index 0da60d5c7a82..44ef2cb64718 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.1/pandoc-1.12.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e86fd26d2528fb3ef01064d7686873c
diff --git a/metadata/md5-cache/app-text/pandoc-1.12.2.1 b/metadata/md5-cache/app-text/pandoc-1.12.2.1
index 86dbec2c2521..d43e03707628 100644
--- a/metadata/md5-cache/app-text/pandoc-1.12.2.1
+++ b/metadata/md5-cache/app-text/pandoc-1.12.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?] >=dev-haskell/texmath-0.6.5.2:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.0.1:= http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 SLOT=0/1.12.2.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.2.1/pandoc-1.12.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aec11ee9a723cf532329c1cf5f7c9c98
diff --git a/metadata/md5-cache/app-text/tofrodos-1.7.12a b/metadata/md5-cache/app-text/tofrodos-1.7.12a
index ecee5f047c2a..2019d60cc474 100644
--- a/metadata/md5-cache/app-text/tofrodos-1.7.12a
+++ b/metadata/md5-cache/app-text/tofrodos-1.7.12a
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=text file conversion utility that converts ASCII files between the MSDOS format and the Unix format
 EAPI=5
 HOMEPAGE=http://tofrodos.sourceforge.net/
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tofrodos.sourceforge.net/download/tofrodos-1.7.12a.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a1e6822304e837c63e904fdf1190c99d
+_md5_=12484a4263bdd3df9b5fece158f842af
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.11 b/metadata/md5-cache/dev-db/lmdb-0.9.11
index 32c5b557e4bd..c0553791b371 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.11
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.11
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=5
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=OPENLDAP
 SLOT=0
 SRC_URI=https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377ed2c1cf1.tar.gz -> lmtp-0.9.11.tar.gz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=33208187788e29c7b03e6ae9d460cda4
+_md5_=7889b4686ef519f23292a2bdab9e9c54
diff --git a/metadata/md5-cache/dev-db/pygresql-4.1.1 b/metadata/md5-cache/dev-db/pygresql-4.1.1
index 4adc028e9ab2..fb0d96aee6cc 100644
--- a/metadata/md5-cache/dev-db/pygresql-4.1.1
+++ b/metadata/md5-cache/dev-db/pygresql-4.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python interface for the PostgreSQL database.
 EAPI=5
 HOMEPAGE=http://www.pygresql.org/
 IUSE=doc python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ~sparc x86
+KEYWORDS=alpha amd64 hppa ~ia64 ppc ~sparc x86
 LICENSE=POSTGRESQL
 RDEPEND=|| ( dev-db/postgresql-base:8.3 dev-db/postgresql-base:8.4 dev-db/postgresql-base:9.0 dev-db/postgresql-base:9.1 dev-db/postgresql-base:9.2 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-4.1.1.tgz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=024ef67889256c80b1b78480a407a6fe
+_md5_=2588380c05602a63fe49c605df8e9d4d
diff --git a/metadata/md5-cache/dev-db/sqlite-3.8.2 b/metadata/md5-cache/dev-db/sqlite-3.8.2
index d642a06bd62d..b992a42f6832 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.2
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl:= )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2013/sqlite-doc-3080200.zip ) tcl? ( http://sqlite.org/2013/sqlite-src-3080200.zip ) !tcl? ( test? ( http://sqlite.org/2013/sqlite-src-3080200.zip ) !test? ( http://sqlite.org/2013/sqlite-autoconf-3080200.tar.gz ) )
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=91614c0645115adad740adc5b3b57fa2
+_md5_=95a68927054a46326c791e06c0bd5f01
diff --git a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
index 458dcd61630c..0ba2772f9368 100644
--- a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=media-libs/libart_lgpl
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6abb44a7d4c074f88a4f6084964e3e6d
diff --git a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
index 8e93c59a404d..4c2d3e6c0fb4 100644
--- a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 dev-libs/atk !<=dev-dotnet/gtk-sharp-2.12
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=79654b5310d31474e94410a7d47ef269
diff --git a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
index 7cc5cc1371e5..5f1fa1b5228f 100644
--- a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gconf-2.24:
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b3c34eedcf5def6a3730a0d3f110ee75
diff --git a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
index 2618ae75227b..20ef3dcdcaa6 100644
--- a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/gtk+:2 ~dev-dotnet/pango-sharp-2
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3b21d5329f8242b75768bb8a118e12e6
diff --git a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
index 3fd0344569fc..c3af75a97061 100644
--- a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a9ce382a498a3cab63dba3772b98cb14
diff --git a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
index fcb5cec1c62f..3d4966e01f24 100644
--- a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-libs/glib:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d177b2e6777a4fbe2119435147584f1
diff --git a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1 b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
index 0b10356a9f9b..45cf8fb69a9e 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
+++ b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-desktop-2.30:2 =dev-dotnet/gtk-sharp-2.12* =dev-dotne
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-2.26.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1b6286566736396f9fadf4c86e1a55c3
diff --git a/metadata/md5-cache/dev-dotnet/gnome-keyring-sharp-1.0.2 b/metadata/md5-cache/dev-dotnet/gnome-keyring-sharp-1.0.2
index 9376f1dabd29..0e31c477ec60 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-keyring-sharp-1.0.2
+++ b/metadata/md5-cache/dev-dotnet/gnome-keyring-sharp-1.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/mono-2.0 >=gnome-base/libgnome-keyring-2.30.0 dev-dotnet/glib-sharp doc? ( virtual/monodoc ) virtual/pkgconfig
+DEPEND=>=dev-lang/mono-2.0 >=gnome-base/libgnome-keyring-2.30.0 dev-dotnet/glib-sharp virtual/pkgconfig
 DESCRIPTION=C# implementation of gnome-keyring
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/ https://github.com/mono/gnome-keyring-sharp
 IUSE=doc
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/mono-2.0 >=gnome-base/libgnome-keyring-2.30.0 dev-dotnet/glib-sharp doc? ( virtual/monodoc )
+RDEPEND=>=dev-lang/mono-2.0 >=gnome-base/libgnome-keyring-2.30.0 dev-dotnet/glib-sharp
 SLOT=0
 SRC_URI=http://www.go-mono.com/archive/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.tar.gz
 _eclasses_=mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a47fcd01cfc7a7dc8ac70b1a8dc66069
+_md5_=97a32721e1cf3296136d667f366af50e
diff --git a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
index 6ab7d0c5b570..a0a7df6556d6 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/libgnomeui-
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=87fd9bd9f78fb26afaa3f24c7f8b919b
diff --git a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
index 592899dc7f65..b2627d5cb012 100644
--- a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gnome-vfs-2
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f67567bd6cbfbe5263e2b9969e45eaf
diff --git a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
index 61e3f480f6aa..223c8a891ca7 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb74ac1640f8c4eb4ac381758886a627
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
index f27c814aed12..6c5a139b9ef3 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a817ae3ce0b81fbfcb50029bbd77c7cd
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
index 6dac76313963..4424336cbb54 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake sys-devel/libtool =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 >=virtual/monodoc-2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake sys-devel/libtool =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 >=dev-lang/mono-2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gtk-docs module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
 IUSE=debug
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=virtual/monodoc-2.0 >=dev-lang/mono-2.0.1
+RDEPEND=>=dev-lang/mono-2.0 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7e74ac1477ab07bbb0f42af741c45439
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
index acb68b0f2d5b..45d3f158ec63 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-perl/XML-LibXML >=dev-lang/mono-2.0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5f556a1fe86ff888029a20cd5288ae93
diff --git a/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0 b/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
index b23395625427..da46e9386993 100644
--- a/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
+++ b/metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-2.26.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5dee914b29e1ab81a10743f7684a6131
diff --git a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
index 84aa837b1662..7c90a9257027 100644
--- a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f46cb2be6a4193bc317980a63b284a29
diff --git a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
index f84a7d24b046..9ded0e3c8c27 100644
--- a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
@@ -10,5 +10,5 @@ RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/pango !<=dev-dotnet/gtk-sharp-2.
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7027265a765e32c1b9dbe0c079a901ec
diff --git a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
index 3275acf80b55..46ad1bdf4f84 100644
--- a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=04d876f75c9a3ebd58e1ad15dad4305f
diff --git a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
index 003c4ea37da4..daaa9e732d62 100644
--- a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=53c638cbb33b33b18cc79619d4d35138
diff --git a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
index 48df9437f7cb..7f5eb2fe35a9 100644
--- a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	dc5dcc87e0c2fea7b4585b3a9a546ddf	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gtk-sharp-module	9d5728acf7e6ed14d6b1b13d1dc5fc9d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=60f21dc618a729da8f4bf554d2104be4
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-0.2.2 b/metadata/md5-cache/dev-haskell/abstract-deque-0.2.2
index 6468ecd93afc..f3daf3c3b9c5 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.2.2
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/abstract-deque/0.2.2/abstract-deque-0.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=023f2b7e61dba8b672596d07596887f9
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.1
index 4b565a5eb01b..f2b1e490b688 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/abstract-par/0.3.1/abstract-par-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f929a0ff0cedf9b50d9fcc6c9cf50d0
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3
index 7c4d715ef3e2..c4f192b45d80 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/abstract-par/0.3.3/abstract-par-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ecbd5e85b86c780cf6c721b5fa7be7a6
diff --git a/metadata/md5-cache/dev-haskell/aeson-0.6.2.1 b/metadata/md5-cache/dev-haskell/aeson-0.6.2.1
index 48c0322341e4..a9eac250c10b 100644
--- a/metadata/md5-cache/dev-haskell/aeson-0.6.2.1
+++ b/metadata/md5-cache/dev-haskell/aeson-0.6.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.8.6.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/dlist-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.2.1
 SRC_URI=mirror://hackage/packages/archive/aeson/0.6.2.1/aeson-0.6.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=44cd3eb35063237e8524f15d72213bde
diff --git a/metadata/md5-cache/dev-haskell/aeson-pretty-0.7 b/metadata/md5-cache/dev-haskell/aeson-pretty-0.7
index 76a2cfe1e3dc..b8459e8c41e0 100644
--- a/metadata/md5-cache/dev-haskell/aeson-pretty-0.7
+++ b/metadata/md5-cache/dev-haskell/aeson-pretty-0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-6.10.4:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
 SLOT=0/0.7
 SRC_URI=mirror://hackage/packages/archive/aeson-pretty/0.7/aeson-pretty-0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8c260ad7061aedd424b476536b7e2636
diff --git a/metadata/md5-cache/dev-haskell/alex-3.0.5 b/metadata/md5-cache/dev-haskell/alex-3.0.5
index 4d037d5de67d..5e71fcf5b538 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.0.5
+++ b/metadata/md5-cache/dev-haskell/alex-3.0.5
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/3.0.5/alex-3.0.5.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a8f51f87b09fabd22af8dfc7cd2aaea0
diff --git a/metadata/md5-cache/dev-haskell/alex-3.1.2 b/metadata/md5-cache/dev-haskell/alex-3.1.2
index ba3c01995120..039e3641f6f9 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.1.2
+++ b/metadata/md5-cache/dev-haskell/alex-3.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
 EAPI=5
 HOMEPAGE=http://www.haskell.org/alex/
 IUSE=doc test
-KEYWORDS=~alpha amd64 ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/3.1.2/alex-3.1.2.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=44dc22d61a33ff55eeac74ecc6c3d421
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=541c84b1f22bb9ce9ef76fe98e8ab965
diff --git a/metadata/md5-cache/dev-haskell/alex-3.1.3 b/metadata/md5-cache/dev-haskell/alex-3.1.3
index 831e06385be7..ecf6a8069a44 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.1.3
+++ b/metadata/md5-cache/dev-haskell/alex-3.1.3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alex/3.1.3/alex-3.1.3.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=55409ce8918a29f6ec0a14f55c76cafb
diff --git a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2 b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
index ac876822725b..b42612a6b357 100644
--- a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib
 SLOT=0/0.5.0.1
 SRC_URI=mirror://hackage/packages/archive/alsa-core/0.5.0.1/alsa-core-0.5.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=06abdcca579a3eacddd812b8786c6836
diff --git a/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2 b/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2
index 9b85c9c52f49..87a02c2a3216 100644
--- a/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2
+++ b/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/alsa-core-0.5* >=dev-lang/ghc-6.10.1 media-libs/alsa-lib
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/alsa-mixer/0.1.2/alsa-mixer-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=485f3d71522c5e2da1ecb84b575194db
diff --git a/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2-r2 b/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2-r2
index 8045647ce702..062ad2110b52 100644
--- a/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-mixer-0.1.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/alsa-core-0.5*:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/alsa-mixer/0.1.2/alsa-mixer-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c9f03b33d61eb5d3b0e59244f27e27e9
diff --git a/metadata/md5-cache/dev-haskell/alut-2.1.0.0 b/metadata/md5-cache/dev-haskell/alut-2.1.0.0
index 08cf20b59b74..0be615900611 100644
--- a/metadata/md5-cache/dev-haskell/alut-2.1.0.0
+++ b/metadata/md5-cache/dev-haskell/alut-2.1.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.4 >=dev-haskell/opengl-2.2.1 >=dev-haskell/openal-1.3.1 media-libs/freealut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ALUT/2.1.0.0/ALUT-2.1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=024a52f50bc7b17cab8c8c80ef3e389a
diff --git a/metadata/md5-cache/dev-haskell/alut-2.2.0.0 b/metadata/md5-cache/dev-haskell/alut-2.2.0.0
index cd29e5da276e..921da60aac9c 100644
--- a/metadata/md5-cache/dev-haskell/alut-2.2.0.0
+++ b/metadata/md5-cache/dev-haskell/alut-2.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/openal[profile?] dev-haskell/statevar[profile?] >=dev-lang/ghc-6.8.2 media-libs/freealut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ALUT/2.2.0.0/ALUT-2.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6d5b7be71e2d17ff8a74b1d77c07a386
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
index 3a5294163ed1..f3c811fd6167 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.5.5/ansi-terminal-0.5.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d5a9a43356996b19f144e3c88591d4c
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5.1 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5.1
index d92525c9f185..81dced0a25b4 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5.1
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.5.1
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.5.5.1/ansi-terminal-0.5.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39ed1dd0742f93cd9c8eebbc9c47692e
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6
index 71b26a6505a4..e117b6ceddc4 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.6/ansi-terminal-0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dfcab7d5ab5bb84deb3f2009c7a4957b
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
index e00346b2275b..e9cdae662025 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/ansi-terminal-0.6[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.4/ansi-wl-pprint-0.6.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cb3ca32544195fc7c0e190b20431859d
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
index 630b0a100fd8..833a2f57c41f 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.6
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.6/ansi-wl-pprint-0.6.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f0dc5235996758c5a36906985c34bb2
diff --git a/metadata/md5-cache/dev-haskell/appar-0.1.4 b/metadata/md5-cache/dev-haskell/appar-0.1.4
index 8d189500d9de..44349c319808 100644
--- a/metadata/md5-cache/dev-haskell/appar-0.1.4
+++ b/metadata/md5-cache/dev-haskell/appar-0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.4
 SRC_URI=mirror://hackage/packages/archive/appar/0.1.4/appar-0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=69c0c5377877c06f6e56590b469a3910
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.0 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.0
index ed95db987071..59e02583545f 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.0
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stream[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/arrows/0.4.4.0/arrows-0.4.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b46896560140ff379580878552b19dc3
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1
index c202eebfd703..140a5885c46c 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stream[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/arrows/0.4.4.1/arrows-0.4.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4b7ce86dba126308bd4a8605a8e322b8
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
index 1c8a2b421cfc..59a183712604 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.4.1
 SRC_URI=mirror://hackage/packages/archive/arrows/0.4.4.1/arrows-0.4.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cc5e24c43c7a38f938cc8f4b26eb54cf
diff --git a/metadata/md5-cache/dev-haskell/asn1-data-0.7.1 b/metadata/md5-cache/dev-haskell/asn1-data-0.7.1
index e47b16767517..d5a31756a7ae 100644
--- a/metadata/md5-cache/dev-haskell/asn1-data-0.7.1
+++ b/metadata/md5-cache/dev-haskell/asn1-data-0.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal[profile?] dev-haskell/mtl[profile?] >=dev-haskell/text-0.11[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/asn1-data/0.7.1/asn1-data-0.7.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=487681c91a8e3891eb5dcc04b10f5458
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.2.0 b/metadata/md5-cache/dev-haskell/asn1-types-0.2.0
index bf2b2409bb9d..73366d77d7fb 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.2.0
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/asn1-types/0.2.0/asn1-types-0.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6dabd6b53ba98fe933b20b0070e71945
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.2.1 b/metadata/md5-cache/dev-haskell/asn1-types-0.2.1
index 25c250052468..7632dca79073 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.2.1
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/asn1-types/0.2.1/asn1-types-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f98f38c9b5f706427136173db7ac19c7
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.2.2 b/metadata/md5-cache/dev-haskell/asn1-types-0.2.2
index 9c46e96e84bc..186a4a045303 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.2.2
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/asn1-types/0.2.2/asn1-types-0.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d7e5c49422cb6b02dd6183699b4d30a7
diff --git a/metadata/md5-cache/dev-haskell/async-2.0.1.4 b/metadata/md5-cache/dev-haskell/async-2.0.1.4
index 534107be72e2..ad8d9a772c69 100644
--- a/metadata/md5-cache/dev-haskell/async-2.0.1.4
+++ b/metadata/md5-cache/dev-haskell/async-2.0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/2.0.1.4
 SRC_URI=mirror://hackage/packages/archive/async/2.0.1.4/async-2.0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bdbce1fd37abb8a442d01b4c7d81a397
diff --git a/metadata/md5-cache/dev-haskell/atomic-primops-0.4-r1 b/metadata/md5-cache/dev-haskell/atomic-primops-0.4-r1
index e6766ea8a1eb..8e0eb1c042a8 100644
--- a/metadata/md5-cache/dev-haskell/atomic-primops-0.4-r1
+++ b/metadata/md5-cache/dev-haskell/atomic-primops-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/bits-atomic:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/atomic-primops/0.4/atomic-primops-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6c07ab8c33215ebe46e0d415d34a53b8
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.10.4.0 b/metadata/md5-cache/dev-haskell/attoparsec-0.10.4.0
index 9c1ca93e54dc..57b01ca3817a 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.10.4.0
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.10.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.10.4.0
 SRC_URI=mirror://hackage/packages/archive/attoparsec/0.10.4.0/attoparsec-0.10.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=64850491cee7d6874d21f3c95c7995f9
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.0.1.2 b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.0.1.2
index 69754949a232..8d7b79af6d91 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.0.1.2
+++ b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.1.2
 SRC_URI=mirror://hackage/packages/archive/attoparsec-conduit/1.0.1.2/attoparsec-conduit-1.0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=11c7734c047ef7597529ea6edbee70f0
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.1-r1 b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.1-r1
index 0a57a674e28a..2e741968bea3 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/attoparsec-enumerator/0.3.1/attoparsec-enumerator-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d9465871e15b2d53ae870e3af32dda4f
diff --git a/metadata/md5-cache/dev-haskell/authenticate-1.3.2.6 b/metadata/md5-cache/dev-haskell/authenticate-1.3.2.6
index d3d616cf7787..6a1966796d21 100644
--- a/metadata/md5-cache/dev-haskell/authenticate-1.3.2.6
+++ b/metadata/md5-cache/dev-haskell/authenticate-1.3.2.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tagsoup-0.12:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.2.6
 SRC_URI=mirror://hackage/packages/archive/authenticate/1.3.2.6/authenticate-1.3.2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05ab63b5c802cd3815144f74aff3eaee
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.2.1 b/metadata/md5-cache/dev-haskell/base-compat-0.2.1
index 4ec0ee4c7c1a..56d44424f4d7 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.2.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/base-compat/0.2.1/base-compat-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f4b5331ebd2c37ae348bdc229659a20e
diff --git a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.3 b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.3
index 654862a26e6e..ab027fa10672 100644
--- a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.3
+++ b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/base-unicode-symbols/0.2.2.3/base-unicode-symbols-0.2.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dac0edd618ea67ba9d48226bcfbff5f8
diff --git a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.4 b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.4
index 87970f5bd9a0..de70070f5071 100644
--- a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.4
+++ b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2.4
 SRC_URI=mirror://hackage/packages/archive/base-unicode-symbols/0.2.2.4/base-unicode-symbols-0.2.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f4fa0553cb418a87db84abc95e5c76a
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.1 b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.1
index b7f87ad2889a..7468726be6e4 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/base64-bytestring/0.1.1.1/base64-bytestring-0.1.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7682ca9fb5128b61aa547fa17fd3119a
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3 b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
index 9e91a811aca8..5d43bcc63968 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/base64-bytestring/0.1.1.3/base64-bytestring-0.1.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=21bc5f5ddea2112e5a3ff82624bcc2fd
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.0 b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.0
index fcb61a538f81..fbf0ffb11565 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.0
 SRC_URI=mirror://hackage/packages/archive/base64-bytestring/1.0.0.0/base64-bytestring-1.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9c34339c596e9701fcb8e3e42da4975f
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.1 b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.1
index 88ad89690952..66977d0da338 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.1
 SRC_URI=mirror://hackage/packages/archive/base64-bytestring/1.0.0.1/base64-bytestring-1.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=17f29e0cc5f821c9ffcd019353bde882
diff --git a/metadata/md5-cache/dev-haskell/base64-conduit-1.0.0 b/metadata/md5-cache/dev-haskell/base64-conduit-1.0.0
index 9fe811e48e5d..d67d24012a88 100644
--- a/metadata/md5-cache/dev-haskell/base64-conduit-1.0.0
+++ b/metadata/md5-cache/dev-haskell/base64-conduit-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/base64-conduit/1.0.0/base64-conduit-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=592961ccf0088b1220c896bfe376b3fb
diff --git a/metadata/md5-cache/dev-haskell/basic-prelude-0.3.5.0 b/metadata/md5-cache/dev-haskell/basic-prelude-0.3.5.0
index 4548c1c5c052..b35ace2a37ea 100644
--- a/metadata/md5-cache/dev-haskell/basic-prelude-0.3.5.0
+++ b/metadata/md5-cache/dev-haskell/basic-prelude-0.3.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] =dev-haskell/readargs-1.2*:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.0
 SRC_URI=mirror://hackage/packages/archive/basic-prelude/0.3.5.0/basic-prelude-0.3.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a9225a820e812a82145412e54fea16cc
diff --git a/metadata/md5-cache/dev-haskell/basic-prelude-0.3.6.0 b/metadata/md5-cache/dev-haskell/basic-prelude-0.3.6.0
index 65551ecf1e89..cab681016ae5 100644
--- a/metadata/md5-cache/dev-haskell/basic-prelude-0.3.6.0
+++ b/metadata/md5-cache/dev-haskell/basic-prelude-0.3.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.6.0
 SRC_URI=mirror://hackage/packages/archive/basic-prelude/0.3.6.0/basic-prelude-0.3.6.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=820c3f660ed5796ccb84fce0600deaef
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-3.2.0.1 b/metadata/md5-cache/dev-haskell/bifunctors-3.2.0.1
index 199bd251132f..66757fa7757f 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-3.2.0.1
+++ b/metadata/md5-cache/dev-haskell/bifunctors-3.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/semigroupoids-3*:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.2.0.1
 SRC_URI=mirror://hackage/packages/archive/bifunctors/3.2.0.1/bifunctors-3.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f4598cf396391044a8a0b6f63b520b13
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-4.1.0.1 b/metadata/md5-cache/dev-haskell/bifunctors-4.1.0.1
index b12d664757f8..ec66cf44e934 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-4.1.0.1
+++ b/metadata/md5-cache/dev-haskell/bifunctors-4.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.1.0.1
 SRC_URI=mirror://hackage/packages/archive/bifunctors/4.1.0.1/bifunctors-4.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=905a5a5d52a8bc570c7d8ec67ef44fc8
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-4.1.1 b/metadata/md5-cache/dev-haskell/bifunctors-4.1.1
index 6a4f52425ee9..ad7110532cc1 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-4.1.1
+++ b/metadata/md5-cache/dev-haskell/bifunctors-4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.1.1
 SRC_URI=mirror://hackage/packages/archive/bifunctors/4.1.1/bifunctors-4.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=db2a7e35f323af9d82b742eab4a84437
diff --git a/metadata/md5-cache/dev-haskell/binary-0.5.0.2 b/metadata/md5-cache/dev-haskell/binary-0.5.0.2
index b7231bbf7351..660e55f42add 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.5.0.2
+++ b/metadata/md5-cache/dev-haskell/binary-0.5.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/binary/0.5.0.2/binary-0.5.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=16e737be818224859e4e53d28d394d33
diff --git a/metadata/md5-cache/dev-haskell/binary-0.5.1.0 b/metadata/md5-cache/dev-haskell/binary-0.5.1.0
index a5e33280429f..624dd13931eb 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.5.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/binary/0.5.1.0/binary-0.5.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cfa3f213e643f72c1b2f019639404de2
diff --git a/metadata/md5-cache/dev-haskell/binary-0.5.1.1 b/metadata/md5-cache/dev-haskell/binary-0.5.1.1
index eb1f2552364b..c47f546e81c7 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/binary-0.5.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.1
 SRC_URI=mirror://hackage/packages/archive/binary/0.5.1.1/binary-0.5.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3bfaa266df9c0ccee3ab4d17773c8654
diff --git a/metadata/md5-cache/dev-haskell/binary-0.7.1.0 b/metadata/md5-cache/dev-haskell/binary-0.7.1.0
index 19c1beb10519..e65e5c10804d 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.7.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.1.0
 SRC_URI=mirror://hackage/packages/archive/binary/0.7.1.0/binary-0.7.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=93ad0d1eccba01ed48b1da2c73dc94a7
diff --git a/metadata/md5-cache/dev-haskell/bio-0.5.3 b/metadata/md5-cache/dev-haskell/bio-0.5.3
index 04137d1ed143..12935740a2e9 100644
--- a/metadata/md5-cache/dev-haskell/bio-0.5.3
+++ b/metadata/md5-cache/dev-haskell/bio-0.5.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.3
 SRC_URI=mirror://hackage/packages/archive/bio/0.5.3/bio-0.5.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=192c0975514446547e2e339dd58f6c73
diff --git a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3 b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3
index 89e5d3eb51ae..8562afa4e31b 100644
--- a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3
+++ b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/bits-atomic/0.1.3/bits-atomic-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=434f377ae389ab8a9b4a364ee9cb87b9
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0
index 4ceb30ee1ef6..692aa4829836 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10[profile?] <dev-haskell/text-0.13[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.1.0/blaze-builder-0.3.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d676e188dcaab4ef892cc3f6318aef84
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0-r1 b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0-r1
index 42290ed58a53..79d1ce38a370 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.13:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.0
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.1.0/blaze-builder-0.3.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1008914c40de1364aa7d7715cd1384b5
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.1 b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.1
index 4e8d2bb8327a..a84eff9ee71a 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.1
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.13:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.1
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.1.1/blaze-builder-0.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da487f8ec70d789669ee2a6fa3385e66
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.2.0 b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.2.0
index e69814e6d118..b3117aec8edf 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.2.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.13:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2.0
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.2.0/blaze-builder-0.3.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f2793e966c5fa77b773f53a024690f90
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.3.2 b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.3.2
index 7071ab298816..9bfc48e11bc0 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.3.3.2
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.3.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3.2
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.3.3.2/blaze-builder-0.3.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=196b00885e6e23b0cf6dba3682d141a6
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.0.0 b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.0.0
index 8b7545076ebd..dc3ce99d3aab 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.0.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] =dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/blaze-builder-conduit/1.0.0/blaze-builder-conduit-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f5c52b56c7f0d8f9fbb2fd796a185d25
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.0.5-r1 b/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.0.5-r1
index c0808b38d89b..664b25872659 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.5
 SRC_URI=mirror://hackage/packages/archive/blaze-builder-enumerator/0.2.0.5/blaze-builder-enumerator-0.2.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5ce8c6492743e9ac70be8c1bfb0fa357
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.4.3.3 b/metadata/md5-cache/dev-haskell/blaze-html-0.4.3.3
index 6d24796c8e0d..099f0840ee08 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.4.3.3
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.4.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2[profile?] <dev-haskell/blaze-builder-0.4[profile?] >=dev-haskell/text-0.10[profile?] <dev-haskell/text-0.12[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.4.3.3/blaze-html-0.4.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9e03b5873fc06dbc3008e83ffc0f46be
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.0 b/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.0
index 42ae24554023..6ee4b98c4761 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.0
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.5.1.0/blaze-html-0.5.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8fdd0576db96d8adc94b38eab925cff5
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3 b/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3
index f35c4a132125..77299b63ceb7 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.5.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.3
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.5.1.3/blaze-html-0.5.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=69c6aefc6dd406669792ae0df65e26bb
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1 b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1
index 13fcac4a35b4..970418c520ce 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1.1
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.1/blaze-html-0.6.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d42f65e08b3d126e2f3ec4552fe3f5c
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
index 0c5d3a7f05df..01e41435fd28 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1.2
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.2/blaze-html-0.6.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b23512ea41e94119b53118bf219cf3ea
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.1 b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.1
index e925f5ed922e..dd867856c566 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2[profile?] <dev-haskell/blaze-builder-0.4[profile?] >=dev-haskell/text-0.10[profile?] <dev-haskell/text-0.12[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.5.1.1/blaze-markup-0.5.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5d57952b16f163520a1ac5a938d58468
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.4 b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.4
index 2d7f7b5116e9..8135aab445f9 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.4
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.4
 SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.5.1.4/blaze-markup-0.5.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea6223e1ca5de6f3d1e70feff7bd856c
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.5 b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.5
index d6d2df919e40..35e924eb0666 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.5
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.5
 SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.5.1.5/blaze-markup-0.5.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=592d876bc15e66a7537c27e628d86d7a
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.6 b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.6
index a17a4dc546af..b4558a669cb2 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.6
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.5.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.6
 SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.5.1.6/blaze-markup-0.5.1.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=65eb51ddaa4629ec0beacd23989753a3
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.10-r1 b/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.10-r1
index d4191a0894c1..64e8eae639cf 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.10-r1
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.10-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-lang/ghc-6.8.2:=
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/bloomfilter/1.2.6.10/bloomfilter-1.2.6.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=541c091eaba2ef29e69cbbbdbb683cd2
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.8 b/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.8
index ba84c10135c2..2298cf65ee48 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.8
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-1.2.6.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/bloomfilter/1.2.6.8/bloomfilter-1.2.6.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=68aba624f3c4e86b24e1f195873a3abd
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index f68e9f17ef71..43115971f801 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/byteable/0.1.1/byteable-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=10f0d6d922783972a5677957071b6c4a
diff --git a/metadata/md5-cache/dev-haskell/byteorder-1.0.4 b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
index f8448296a89f..9646f65df4fa 100644
--- a/metadata/md5-cache/dev-haskell/byteorder-1.0.4
+++ b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.4
 SRC_URI=mirror://hackage/packages/archive/byteorder/1.0.4/byteorder-1.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c6480a355f13e93ffd74cba603ab0404
diff --git a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1 b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
index ffbba4d4dd4e..2716ed7889ec 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/bytestring-mmap/0.2.2/bytestring-mmap-0.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e34fd9f396e84aae791fe6275516ab3
diff --git a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.4-r2 b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.4-r2
index 148f70688a4d..98f4eb369e53 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.4-r2
+++ b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.4-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/binary-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.4
 SRC_URI=mirror://hackage/packages/archive/bytestring-show/0.3.5.4/bytestring-show-0.3.5.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e8897feac720493ad4f9b0bd5e237f7c
diff --git a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.5 b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.5
index 244806d50bb3..0c6cb153057f 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.5
+++ b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/binary-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.5
 SRC_URI=mirror://hackage/packages/archive/bytestring-show/0.3.5.5/bytestring-show-0.3.5.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8869c571314f80eb59a792d184f21ad4
diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3 b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3
index 18a95f6de5fb..6486bdbe939f 100644
--- a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3
+++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2 >=app-arch/bzip2-1.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/bzlib/0.5.0.3/bzlib-0.5.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c12bb1d2426327ef1095d706778ab546
diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.4 b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.4
index 2affefc82e8f..6494cd9f5971 100644
--- a/metadata/md5-cache/dev-haskell/bzlib-0.5.0.4
+++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= app-arch/bzip2
 SLOT=0/0.5.0.4
 SRC_URI=mirror://hackage/packages/archive/bzlib/0.5.0.4/bzlib-0.5.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=52edae40841e81f6295c0e286389b5b2
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.16.3 b/metadata/md5-cache/dev-haskell/c2hs-0.16.3
index eaedf78d97c0..c8021e4fab70 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.16.3
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.16.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.3/c2hs-0.16.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e59ed5efea424597abe0eb46105bd33c
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.16.3-r1 b/metadata/md5-cache/dev-haskell/c2hs-0.16.3-r1
index 471648054792..973c813ce0e5 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.16.3-r1
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.16.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.3/c2hs-0.16.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89635d958ca1c7bb2f069d2da42eba10
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.16.4 b/metadata/md5-cache/dev-haskell/c2hs-0.16.4
index 539d907279d2..c605aacfd6bb 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.16.4
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.16.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.4/c2hs-0.16.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e35439b1cc7f9c6c96f5a34363387d3
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.16.5 b/metadata/md5-cache/dev-haskell/c2hs-0.16.5
index 7476460d171e..2306f95dbea5 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.16.5
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.16.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/c2hs/0.16.5/c2hs-0.16.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1fba71e23f17213714e951f25d6453a6
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.14.0 b/metadata/md5-cache/dev-haskell/cabal-1.14.0
index cf0dcfec612f..99d297ce1b5d 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.14.0
+++ b/metadata/md5-cache/dev-haskell/cabal-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.1 <dev-lang/ghc-7.6.0 virtual/pkgconfig
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.14.0/Cabal-1.14.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7e89a05466785dcb57c0f95918519d5f
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.16.0.3 b/metadata/md5-cache/dev-haskell/cabal-1.16.0.3
index 46b6eca9f3d6..3cf7f129e614 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.16.0.3
+++ b/metadata/md5-cache/dev-haskell/cabal-1.16.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:= virtual/pkgconfig
 RESTRICT=test
 SLOT=0/1.16.0.3
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.16.0.3/Cabal-1.16.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9b170a255a047b7d3826d18626c0c063
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.0 b/metadata/md5-cache/dev-haskell/cabal-1.18.0
index ba9a17d93a99..2bae0fff2b83 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.0
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6:=
 SLOT=0/1.18.0
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.18.0/Cabal-1.18.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d48226a084540753de680206a7ae4c63
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
index 1e01e7d56df7..9c7304824c64 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/1.18.1.2
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.18.1.2/Cabal-1.18.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d9b1012dc668394499f2e19b064e7149
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-0.10.2-r2 b/metadata/md5-cache/dev-haskell/cabal-install-0.10.2-r2
index 26e01c505192..d09110141f8c 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-0.10.2-r2
+++ b/metadata/md5-cache/dev-haskell/cabal-install-0.10.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10.1 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cabal-install/0.10.2/cabal-install-0.10.2.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a47b07fd2d4358fb1776f256ab7e2a1
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-0.14.0 b/metadata/md5-cache/dev-haskell/cabal-install-0.14.0
index bd67054ee83c..0bb887c168f9 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-0.14.0
+++ b/metadata/md5-cache/dev-haskell/cabal-install-0.14.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cabal-install/0.14.0/cabal-install-0.14.0.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e29f20f1d4c384b2fef6326b5947ec4
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-1.16.0.2 b/metadata/md5-cache/dev-haskell/cabal-install-1.16.0.2
index b93c957d6be0..d5e3f75f751b 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-1.16.0.2
+++ b/metadata/md5-cache/dev-haskell/cabal-install-1.16.0.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cabal-install/1.16.0.2/cabal-install-1.16.0.2.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d7744dfdbce0e480787550e804516fc
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.2 b/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.2
index dc97036a5f9e..268eaee69b7a 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.2
+++ b/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cabal-install/1.18.0.2/cabal-install-1.18.0.2.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3a5c2d21db1144dbded27eee3ba219dc
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.0 b/metadata/md5-cache/dev-haskell/cairo-0.12.0
index dde9571ccdce..616347fc0a87 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.0
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl >=dev-lang/ghc-6.10.1 x11-libs/cairo[svg?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.0/cairo-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c6ffde9b103502e967dd1c7cc6db12a0
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.3 b/metadata/md5-cache/dev-haskell/cairo-0.12.3
index e05574e5a2af..9c2692ecc48c 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.3
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl >=dev-lang/ghc-6.10.1 x11-libs/cairo[svg?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.3/cairo-0.12.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd85a763fb0ddd537c8efb150aff570c
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.3.1 b/metadata/md5-cache/dev-haskell/cairo-0.12.3.1
index 856c34e954c0..4fb0fc4e0cbc 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo[svg?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.3.1/cairo-0.12.3.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b06291f851df0e5d5148abfe7fe09f2c
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.4-r1 b/metadata/md5-cache/dev-haskell/cairo-0.12.4-r1
index aba1180e0867..333eec124491 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.4-r1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the Cairo library.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=+svg doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo[svg?]
 SLOT=0/0.12.4
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.4/cairo-0.12.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=84c7c62bf0f2198e26eb3e6b930f8672
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=dd0a2160b865bfa4234dace1e23d9125
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
index d08e4edd8237..60140802e389 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo[svg?]
 SLOT=0/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.5.0/cairo-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3ff2c05fa9532223daa33fc809c3ec3e
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.0.0.2 b/metadata/md5-cache/dev-haskell/case-insensitive-1.0.0.2
index 767306454f3f..5ffd4fe34270 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.0.0.2
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.2
 SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.0.0.2/case-insensitive-1.0.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c539a47b09a9c222a70b82d41cbb6445
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.1 b/metadata/md5-cache/dev-haskell/case-insensitive-1.1
index 19cb118a1925..2794750b8727 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.1
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1
 SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.1/case-insensitive-1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b903c8624f2c78e43a8b113e893a0dd4
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.1 b/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.1
index 365f3abf25c0..352a07aacb1f 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0.1
 SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.1.0.1/case-insensitive-1.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=70a6f8da91d86190243094fc303665dc
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.2 b/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.2
index 39f317d5170b..ae6999938f7e 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.2
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.2
 SRC_URI=mirror://hackage/packages/archive/case-insensitive/1.1.0.2/case-insensitive-1.1.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d6929c1603a31c0a057dafc422f2601c
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.3.5.2 b/metadata/md5-cache/dev-haskell/cereal-0.3.5.2
index c2fe1a83a03f..bca1a49d9878 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.3.5.2
+++ b/metadata/md5-cache/dev-haskell/cereal-0.3.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A binary serialization library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/cereal
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.2
 SRC_URI=mirror://hackage/packages/archive/cereal/0.3.5.2/cereal-0.3.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f7de48f25d7e67fe07156cba4ed90913
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f2498f5f6ec7ac144f48b819e2882f7f
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.4.0.1 b/metadata/md5-cache/dev-haskell/cereal-0.4.0.1
index f05b3a32f1b6..010d30d13445 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/cereal-0.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/cereal/0.4.0.1/cereal-0.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=196b469300436ec7d7122015b902bad5
diff --git a/metadata/md5-cache/dev-haskell/certificate-1.3.7 b/metadata/md5-cache/dev-haskell/certificate-1.3.7
index 019f99bdeadb..dbdb1b0d0d2f 100644
--- a/metadata/md5-cache/dev-haskell/certificate-1.3.7
+++ b/metadata/md5-cache/dev-haskell/certificate-1.3.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=
 RESTRICT=test
 SLOT=0/1.3.7
 SRC_URI=mirror://hackage/packages/archive/certificate/1.3.7/certificate-1.3.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=430bf6476628ffa01f3d44fd4c69007e
diff --git a/metadata/md5-cache/dev-haskell/certificate-1.3.8 b/metadata/md5-cache/dev-haskell/certificate-1.3.8
index ea4199ac8d00..3023e6fbacef 100644
--- a/metadata/md5-cache/dev-haskell/certificate-1.3.8
+++ b/metadata/md5-cache/dev-haskell/certificate-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=
 RESTRICT=test
 SLOT=0/1.3.8
 SRC_URI=mirror://hackage/packages/archive/certificate/1.3.8/certificate-1.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b95603374845e144511be05c0480f7c7
diff --git a/metadata/md5-cache/dev-haskell/certificate-1.3.8-r1 b/metadata/md5-cache/dev-haskell/certificate-1.3.8-r1
index f01e917f512f..18303d784b61 100644
--- a/metadata/md5-cache/dev-haskell/certificate-1.3.8-r1
+++ b/metadata/md5-cache/dev-haskell/certificate-1.3.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=
 RESTRICT=test
 SLOT=0/1.3.8
 SRC_URI=mirror://hackage/packages/archive/certificate/1.3.8/certificate-1.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a63b800a5e045aec753e01e3e0a480e7
diff --git a/metadata/md5-cache/dev-haskell/certificate-1.3.9 b/metadata/md5-cache/dev-haskell/certificate-1.3.9
index fca00cff6d30..431badcda604 100644
--- a/metadata/md5-cache/dev-haskell/certificate-1.3.9
+++ b/metadata/md5-cache/dev-haskell/certificate-1.3.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=
 RESTRICT=test
 SLOT=0/1.3.9
 SRC_URI=mirror://hackage/packages/archive/certificate/1.3.9/certificate-1.3.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa89c6ddb662c527a73c0a873b4b4e86
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
index b1f4bfe056f9..6b6772a3ac00 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/monadcatchio-mtl >=dev-haskell/mtl-1.0 >=dev-haskell/network-2.0 >=dev-haskell/parsec-2.0 >=dev-haskell/xhtml-3000.0.0 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.2/cgi-3001.1.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bf677065b7c6ebf1d9f707500c29b75c
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
index c2157d7ee62e..684d3136a346 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3001.1.8.3
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.3/cgi-3001.1.8.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=df0c6de13762b279229db855702f357f
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4
index e2e411797a71..c2b28f462af5 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] )
 SLOT=0/3001.1.8.4
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.4/cgi-3001.1.8.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=66532ca36fd874eac42c29f2ee954759
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4-r1 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4-r1
index e221467f0ac2..c8a283b2d920 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4-r1
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= !extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] )
 SLOT=0/3001.1.8.4
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.4/cgi-3001.1.8.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4148becd14b41016bfb7dcecce06464b
diff --git a/metadata/md5-cache/dev-haskell/chaselev-deque-0.4 b/metadata/md5-cache/dev-haskell/chaselev-deque-0.4
index 09727e42c1d9..2dce94687fa0 100644
--- a/metadata/md5-cache/dev-haskell/chaselev-deque-0.4
+++ b/metadata/md5-cache/dev-haskell/chaselev-deque-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deq
 RESTRICT=test
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/chaselev-deque/0.4/chaselev-deque-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=73419e7bb0456879b905b90f5388c8ec
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.5-r2 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.5-r2
index 0282d6b86821..9c266fde31e7 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.5-r2
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.5-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.0.5
 SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.5/ChasingBottoms-1.3.0.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=413c7e59496fb6925a96e9cf028bd047
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.6 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.6
index 9ff2e682f16d..cdd1cdefeb9a 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.6
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.0.6
 SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.6/ChasingBottoms-1.3.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f66324c53485243900da010ecaeb868
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.7 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.7
index 1ebfe30c6d1d..bb4d7501af79 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.7
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/quickcheck-2.1:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.0.7
 SRC_URI=mirror://hackage/packages/archive/ChasingBottoms/1.3.0.7/ChasingBottoms-1.3.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=48f4e86ea407d9d20bdf90a573a0e8c7
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.1.8 b/metadata/md5-cache/dev-haskell/cipher-aes-0.1.8
index 982c4012bb29..29b0364e069e 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.1.8
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.8
 SRC_URI=mirror://hackage/packages/archive/cipher-aes/0.1.8/cipher-aes-0.1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a742981fcc3be3376f1be052f97cb112
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.5 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.5
index 5a152b806175..a4a0db7e58c6 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.5
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.5
 SRC_URI=mirror://hackage/packages/archive/cipher-aes/0.2.5/cipher-aes-0.2.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0f72b2dfbaac093fd77508eb0b315730
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.6 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.6
index 9cf473f5e3a6..22a47057d7c4 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.6
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.6
 SRC_URI=mirror://hackage/packages/archive/cipher-aes/0.2.6/cipher-aes-0.2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6cf791a8fe7a9dbeab40bdf0b371cca6
diff --git a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.2 b/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.2
index 6ad435ceedf9..26d2b0fc80da 100644
--- a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.2
+++ b/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.2
 SRC_URI=mirror://hackage/packages/archive/cipher-blowfish/0.0.2/cipher-blowfish-0.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c67b66c09732b0f539c470196cd62ea4
diff --git a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3 b/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3
index 82689e158b1e..787063cb5002 100644
--- a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3
+++ b/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.3
 SRC_URI=mirror://hackage/packages/archive/cipher-blowfish/0.0.3/cipher-blowfish-0.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d4d395f8fa01a4db988fb3839300bb91
diff --git a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.1 b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.1
index 04d772535fe1..819dd7647be1 100644
--- a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.1
+++ b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/cipher-camellia/0.0.1/cipher-camellia-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=099852712d340934c02c085571fd72a0
diff --git a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2 b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
index 43023bddddcf..f0bf9968dbec 100644
--- a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
+++ b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.2
 SRC_URI=mirror://hackage/packages/archive/cipher-camellia/0.0.2/cipher-camellia-0.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=24e3663d555dea4cee9c4cc3abac1300
diff --git a/metadata/md5-cache/dev-haskell/cipher-des-0.0.4 b/metadata/md5-cache/dev-haskell/cipher-des-0.0.4
index 4fbcdf6f978f..89bfba15a101 100644
--- a/metadata/md5-cache/dev-haskell/cipher-des-0.0.4
+++ b/metadata/md5-cache/dev-haskell/cipher-des-0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.4
 SRC_URI=mirror://hackage/packages/archive/cipher-des/0.0.4/cipher-des-0.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=abf2867fb9ddd1ee0bdb9fbdccad6c2e
diff --git a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6 b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
index 8508db3dc737..7ec75f0f377f 100644
--- a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
+++ b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.6
 SRC_URI=mirror://hackage/packages/archive/cipher-des/0.0.6/cipher-des-0.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9da9e84cd9cd52c3cc00f8b6aa2917d2
diff --git a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.2 b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.2
index afcc444d0a4c..f07d1ec42531 100644
--- a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.2
+++ b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/cipher-rc4/0.1.2/cipher-rc4-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=52026448aa7607ab9d62ed857a54cfaa
diff --git a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4 b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
index 0a8a433ca632..58a9496eb0c1 100644
--- a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
+++ b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.4
 SRC_URI=mirror://hackage/packages/archive/cipher-rc4/0.1.4/cipher-rc4-0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a63af74f95d58bf0ceace1a26ca50c4e
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.2 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.2
index 3352f0024089..0ebdc5158c7f 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.2
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json[generic] dev-haskell/mtl =dev-haskell/pandoc-types-1.8* dev-haskell/parsec dev-haskell/utf8-string dev-haskell/xml >=dev-lang/ghc-6.10.1 bibutils? ( >=dev-haskell/hs-bibutils-0.3 ) network? ( >=dev-haskell/network-2 >=dev-haskell/http-4000.0.9 )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.2/citeproc-hs-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb018394c14c32913bf48d51c0778a6e
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.4 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.4
index 8aad6b842812..76aa8cc3f945 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.4
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json[generic] dev-haskell/mtl >=dev-haskell/pandoc-types-1.8 dev-haskell/parsec dev-haskell/utf8-string dev-haskell/xml >=dev-lang/ghc-6.10.1 bibutils? ( >=dev-haskell/hs-bibutils-0.3 ) network? ( >=dev-haskell/network-2 >=dev-haskell/http-4000.0.9 )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.4/citeproc-hs-0.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7885293a7a2d60ed9ef270ae414c17ef
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.6 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.6
index bad7cfb5a82c..b86f71d2d339 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.6
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json:=[generic,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.11:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] !hexpat? ( dev-haskell/xml:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) >=dev-lang/ghc-6.10.4:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] )
 SLOT=0/0.3.6
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.6/citeproc-hs-0.3.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ead034a6583a7d77423f268622eb7e45
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.7 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.7
index f4f217c68f85..06a5bd8f5af1 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.7
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json:=[generic,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.11:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] !hexpat? ( dev-haskell/xml:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) >=dev-lang/ghc-6.10.4:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] )
 SLOT=0/0.3.7
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.7/citeproc-hs-0.3.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8e3f38c5f20881b1668c60bd8d6886d6
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r1 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r1
index 4eec67ddfd57..c111bbd2a4f0 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r1
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json:=[generic,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.11:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] )
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.8/citeproc-hs-0.3.8.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3777b34b32e2a763abb236af13bd855a
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r2 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r2
index ea25b807c596..475969af7b0b 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r2
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.8-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/json:=[generic,profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] )
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.8/citeproc-hs-0.3.8.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b7ddb25dc30c0ee8048d89597e178b0f
diff --git a/metadata/md5-cache/dev-haskell/classy-prelude-0.5.8 b/metadata/md5-cache/dev-haskell/classy-prelude-0.5.8
index 556276fa723c..2d5ec6dba256 100644
--- a/metadata/md5-cache/dev-haskell/classy-prelude-0.5.8
+++ b/metadata/md5-cache/dev-haskell/classy-prelude-0.5.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.8
 SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.5.8/classy-prelude-0.5.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c855f45f85eeec9fabe8ab69f5190fb6
diff --git a/metadata/md5-cache/dev-haskell/classy-prelude-0.5.9 b/metadata/md5-cache/dev-haskell/classy-prelude-0.5.9
index 141c554859b2..897397e97092 100644
--- a/metadata/md5-cache/dev-haskell/classy-prelude-0.5.9
+++ b/metadata/md5-cache/dev-haskell/classy-prelude-0.5.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.4:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/deepseq:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.9
 SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.5.9/classy-prelude-0.5.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1c39579837a4fe0bebcb114594bbee7e
diff --git a/metadata/md5-cache/dev-haskell/classy-prelude-0.6.0 b/metadata/md5-cache/dev-haskell/classy-prelude-0.6.0
index 1813d3b2683d..1bc251efffd1 100644
--- a/metadata/md5-cache/dev-haskell/classy-prelude-0.6.0
+++ b/metadata/md5-cache/dev-haskell/classy-prelude-0.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/async-2.0:=[profile?] >=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?] dev-haskell/deepseq:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mono-traversable:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.0
 SRC_URI=mirror://hackage/packages/archive/classy-prelude/0.6.0/classy-prelude-0.6.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=19cb6d0d32a8a24cdc199cead9e0c6d2
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.0.2 b/metadata/md5-cache/dev-haskell/clientsession-0.9.0.2
index 6fcbcbdbbe8a..f61ef1c14c78 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.0.2
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] =dev-haskell/skein-1.0*:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.0.2
 SRC_URI=mirror://hackage/packages/archive/clientsession/0.9.0.2/clientsession-0.9.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb582ec8cac552581c9c8e94e2f347c4
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.0.3 b/metadata/md5-cache/dev-haskell/clientsession-0.9.0.3
index 8354c2a815d3..4adbaa23bf45 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.0.3
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.0.3
 SRC_URI=mirror://hackage/packages/archive/clientsession/0.9.0.3/clientsession-0.9.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0b77f41627b3007923c1ff6dd5a54603
diff --git a/metadata/md5-cache/dev-haskell/cmdargs-0.10.5 b/metadata/md5-cache/dev-haskell/cmdargs-0.10.5
index 91b5592184ed..a18675614143 100644
--- a/metadata/md5-cache/dev-haskell/cmdargs-0.10.5
+++ b/metadata/md5-cache/dev-haskell/cmdargs-0.10.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.10.5
 SRC_URI=mirror://hackage/packages/archive/cmdargs/0.10.5/cmdargs-0.10.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=22abae14c47656a7b0ad43e36c8b6d4e
diff --git a/metadata/md5-cache/dev-haskell/cmdargs-0.10.7 b/metadata/md5-cache/dev-haskell/cmdargs-0.10.7
index 2b3e96c49da6..e9660793c534 100644
--- a/metadata/md5-cache/dev-haskell/cmdargs-0.10.7
+++ b/metadata/md5-cache/dev-haskell/cmdargs-0.10.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.10.7
 SRC_URI=mirror://hackage/packages/archive/cmdargs/0.10.7/cmdargs-0.10.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e3bde2d092af0e79c48b5412dd5adee
diff --git a/metadata/md5-cache/dev-haskell/cmdlib-0.3.5 b/metadata/md5-cache/dev-haskell/cmdlib-0.3.5
index 07cd4c4353cb..3c5ee2a654b6 100644
--- a/metadata/md5-cache/dev-haskell/cmdlib-0.3.5
+++ b/metadata/md5-cache/dev-haskell/cmdlib-0.3.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] dev-haskell/split[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cmdlib/0.3.5/cmdlib-0.3.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2e9fd46f35a547fd3fbdeb9966727af2
diff --git a/metadata/md5-cache/dev-haskell/cmdlib-0.3.5-r1 b/metadata/md5-cache/dev-haskell/cmdlib-0.3.5-r1
index d93ac1ae03a8..940c15f45fe6 100644
--- a/metadata/md5-cache/dev-haskell/cmdlib-0.3.5-r1
+++ b/metadata/md5-cache/dev-haskell/cmdlib-0.3.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a library for command line parsing & online help
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/cmdlib
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5
 SRC_URI=mirror://hackage/packages/archive/cmdlib/0.3.5/cmdlib-0.3.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e6c758e02baa966036d62c96a51ec855
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=34203e530a256832bfdc91d270e2725c
diff --git a/metadata/md5-cache/dev-haskell/comonad-3.1 b/metadata/md5-cache/dev-haskell/comonad-3.1
index 090f4a046b18..bcfffd575413 100644
--- a/metadata/md5-cache/dev-haskell/comonad-3.1
+++ b/metadata/md5-cache/dev-haskell/comonad-3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.8.3:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/3.1
 SRC_URI=mirror://hackage/packages/archive/comonad/3.1/comonad-3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=10cfb9a7380443ea3aad1f7d513b0ac5
diff --git a/metadata/md5-cache/dev-haskell/comonad-4.0 b/metadata/md5-cache/dev-haskell/comonad-4.0
index bc9d88540bdc..c7932db8e9fc 100644
--- a/metadata/md5-cache/dev-haskell/comonad-4.0
+++ b/metadata/md5-cache/dev-haskell/comonad-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/comonad/4.0/comonad-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b3b57cc131b4f8aed848f92935e67c49
diff --git a/metadata/md5-cache/dev-haskell/comonad-transformers-3.1 b/metadata/md5-cache/dev-haskell/comonad-transformers-3.1
index c39e23f90bfd..6c39507c7403 100644
--- a/metadata/md5-cache/dev-haskell/comonad-transformers-3.1
+++ b/metadata/md5-cache/dev-haskell/comonad-transformers-3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3.0:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/3.1
 SRC_URI=mirror://hackage/packages/archive/comonad-transformers/3.1/comonad-transformers-3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dc491bc827d1caf2d1ec5cc825c543ee
diff --git a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0 b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
index 2c36d263b35c..3212b3ad87e0 100644
--- a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
+++ b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/comonad-transformers/4.0/comonad-transformers-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6af4494a6bddb0bba03de1964849a81f
diff --git a/metadata/md5-cache/dev-haskell/comonads-fd-3.0.2 b/metadata/md5-cache/dev-haskell/comonads-fd-3.0.2
index 8f90d79ff15f..bb964343493c 100644
--- a/metadata/md5-cache/dev-haskell/comonads-fd-3.0.2
+++ b/metadata/md5-cache/dev-haskell/comonads-fd-3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3.0:=[profile?] >=dev-haskell/comonad-transformers-3.0:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.0.2
 SRC_URI=mirror://hackage/packages/archive/comonads-fd/3.0.2/comonads-fd-3.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fe1c84440614ea13d2e976ee59a28c14
diff --git a/metadata/md5-cache/dev-haskell/comonads-fd-3.0.3 b/metadata/md5-cache/dev-haskell/comonads-fd-3.0.3
index abf3b878a601..0391a3f900f6 100644
--- a/metadata/md5-cache/dev-haskell/comonads-fd-3.0.3
+++ b/metadata/md5-cache/dev-haskell/comonads-fd-3.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/comonad-3*:=[profile?] =dev-haskell/comonad-transformers-3*:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.0.3
 SRC_URI=mirror://hackage/packages/archive/comonads-fd/3.0.3/comonads-fd-3.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da8c08816fa609e7cbc5f4064288bc54
diff --git a/metadata/md5-cache/dev-haskell/comonads-fd-4.0 b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
index e70b20f2d4e9..dafb03d0bbc0 100644
--- a/metadata/md5-cache/dev-haskell/comonads-fd-4.0
+++ b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/comonads-fd/4.0/comonads-fd-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fcc25b8c10a1b568f92ace3b3c200fce
diff --git a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.6 b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.6
index 56b9726dd9e7..24091914afcb 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.6
+++ b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] =dev-haskell/unbounded-delays-0.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.0.6
 SRC_URI=mirror://hackage/packages/archive/concurrent-extra/0.7.0.6/concurrent-extra-0.7.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=878d2f4e4ef9732f03a4bb435335ddd6
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.0.7.3 b/metadata/md5-cache/dev-haskell/conduit-1.0.7.3
index 04fda389a187..afb410b13a09 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.0.7.3
+++ b/metadata/md5-cache/dev-haskell/conduit-1.0.7.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.0.7.3
 SRC_URI=mirror://hackage/packages/archive/conduit/1.0.7.3/conduit-1.0.7.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0c33ab086245a7cd5764b288570fb9af
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.0.7.4 b/metadata/md5-cache/dev-haskell/conduit-1.0.7.4
index 7336e2998181..9d8fdcd98278 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.0.7.4
+++ b/metadata/md5-cache/dev-haskell/conduit-1.0.7.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.0.7.4
 SRC_URI=mirror://hackage/packages/archive/conduit/1.0.7.4/conduit-1.0.7.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=66c92a4f9a28c6e9d0061dd18ce5143d
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.0.8 b/metadata/md5-cache/dev-haskell/conduit-1.0.8
index 5852c2c3cf7f..ca5b6f098d00 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.0.8
+++ b/metadata/md5-cache/dev-haskell/conduit-1.0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.0.8
 SRC_URI=mirror://hackage/packages/archive/conduit/1.0.8/conduit-1.0.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a8d97cb4a8416c52bc41c28c38fbf038
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.0.9.3 b/metadata/md5-cache/dev-haskell/conduit-1.0.9.3
index be52fa87a1a7..9e4b3578ada7 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.0.9.3
+++ b/metadata/md5-cache/dev-haskell/conduit-1.0.9.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.0.9.3
 SRC_URI=mirror://hackage/packages/archive/conduit/1.0.9.3/conduit-1.0.9.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb4c8eb61eba75cb6931fb858c96094e
diff --git a/metadata/md5-cache/dev-haskell/configfile-1.1.1 b/metadata/md5-cache/dev-haskell/configfile-1.1.1
index b5880f86c81c..955e666364a1 100644
--- a/metadata/md5-cache/dev-haskell/configfile-1.1.1
+++ b/metadata/md5-cache/dev-haskell/configfile-1.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/missingh-1.0.0[profile?] dev-haskell/mtl[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ConfigFile/1.1.1/ConfigFile-1.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e7f68a545dfe23501d432991cb97e18d
diff --git a/metadata/md5-cache/dev-haskell/connection-0.1.3.1 b/metadata/md5-cache/dev-haskell/connection-0.1.3.1
index debfd77e540a..95d3aabbb30f 100644
--- a/metadata/md5-cache/dev-haskell/connection-0.1.3.1
+++ b/metadata/md5-cache/dev-haskell/connection-0.1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/certificate-1.3.0:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] dev-haskell/cprng-aes:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/socks-0.4:=[profile?] >=dev-haskell/tls-1.0:=[profile?] <dev-haskell/tls-1.2:=[profile?] >=dev-haskell/tls-extra-0.5:=[profile?] <dev-haskell/tls-extra-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3.1
 SRC_URI=mirror://hackage/packages/archive/connection/0.1.3.1/connection-0.1.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=56c0debfda56fd90d12f4db0082ff339
diff --git a/metadata/md5-cache/dev-haskell/contravariant-0.4.4 b/metadata/md5-cache/dev-haskell/contravariant-0.4.4
index 41ae7df4f950..d482f1bc0437 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-0.4.4
+++ b/metadata/md5-cache/dev-haskell/contravariant-0.4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/contravariant/0.4.4/contravariant-0.4.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c4e841363077d54860a07e841cdfb2f7
diff --git a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1 b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
index e0b6b963f6e1..bbcdf42168af 100644
--- a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
+++ b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1
 SRC_URI=mirror://hackage/packages/archive/control-monad-loop/0.1/control-monad-loop-0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4914fe61cf230950022a40ad4f227742
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.0.10.0 b/metadata/md5-cache/dev-haskell/convertible-1.0.10.0
index 2db011456c56..aee1a778710d 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.0.10.0
+++ b/metadata/md5-cache/dev-haskell/convertible-1.0.10.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/mtl >=dev-haskell/text-0.7 >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/convertible/1.0.10.0/convertible-1.0.10.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da85777e4b90f4e3c1cae88532ac3eb0
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.0.11.1 b/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
index a3ba4b868338..f0f7a6b2fab5 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
+++ b/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.7[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/convertible/1.0.11.1/convertible-1.0.11.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e88e65c93467e71118ad71924dc9f38b
diff --git a/metadata/md5-cache/dev-haskell/cookie-0.4.0.1 b/metadata/md5-cache/dev-haskell/cookie-0.4.0.1
index 43b544ff861e..042939d9117e 100644
--- a/metadata/md5-cache/dev-haskell/cookie-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/cookie-0.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1[profile?] dev-haskell/data-default[profile?] >=dev-haskell/text-0.7[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cookie/0.4.0.1/cookie-0.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=516e02e26a6b0496fbb719f8f91549eb
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.13.3 b/metadata/md5-cache/dev-haskell/cpphs-1.13.3
index 18a5b343aa0e..4f4549a9cbb1 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.13.3
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.13.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cpphs/1.13.3/cpphs-1.13.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3fd48a901e3afd8113183b44be2ba0e1
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.15 b/metadata/md5-cache/dev-haskell/cpphs-1.15
index 93ecfd9d837d..5183c1aff412 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.15
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.15
 SRC_URI=mirror://hackage/packages/archive/cpphs/1.15/cpphs-1.15.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd3f03912850225b589175640b6bb519
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.16 b/metadata/md5-cache/dev-haskell/cpphs-1.16
index 455b1f858b04..5d71982ca351 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.16
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.16
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.16
 SRC_URI=mirror://hackage/packages/archive/cpphs/1.16/cpphs-1.16.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=709add4151a418ae1c7a57902da59d93
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.17.1 b/metadata/md5-cache/dev-haskell/cpphs-1.17.1
index a805a958b168..9a3470fb4027 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.17.1
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.17.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.17.1
 SRC_URI=mirror://hackage/packages/archive/cpphs/1.17.1/cpphs-1.17.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=be6562d8986f6630ed649b3416c778c6
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.3.4 b/metadata/md5-cache/dev-haskell/cprng-aes-0.3.4
index e8b723f5c7e3..fd875225d598 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.3.4
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/cipher-aes-0.1*:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] =dev-haskell/crypto-random-api-0.2*:=[profile?] >=dev-haskell/entropy-0.2:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.4
 SRC_URI=mirror://hackage/packages/archive/cprng-aes/0.3.4/cprng-aes-0.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=22c68fe741218b5e72c9c0d5fd3fba68
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.5.2 b/metadata/md5-cache/dev-haskell/cprng-aes-0.5.2
index b608fee50579..c4487094ad44 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.5.2
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.2
 SRC_URI=mirror://hackage/packages/archive/cprng-aes/0.5.2/cprng-aes-0.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=04d7889803c4ae0c67da677e5a3177c6
diff --git a/metadata/md5-cache/dev-haskell/cpu-0.1.1 b/metadata/md5-cache/dev-haskell/cpu-0.1.1
index ebb664c2052d..866da54eccd8 100644
--- a/metadata/md5-cache/dev-haskell/cpu-0.1.1
+++ b/metadata/md5-cache/dev-haskell/cpu-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cpu/0.1.1/cpu-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=74a9be8ebc7e0e29fac1bb7ba867a251
diff --git a/metadata/md5-cache/dev-haskell/cpu-0.1.2 b/metadata/md5-cache/dev-haskell/cpu-0.1.2
index e70c58753c0c..41ad83813285 100644
--- a/metadata/md5-cache/dev-haskell/cpu-0.1.2
+++ b/metadata/md5-cache/dev-haskell/cpu-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/cpu/0.1.2/cpu-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=285317f7912cd918053ce80c288bdbb7
diff --git a/metadata/md5-cache/dev-haskell/criterion-0.6.2.1 b/metadata/md5-cache/dev-haskell/criterion-0.6.2.1
index 690d6ee1d476..8c94d9a7299f 100644
--- a/metadata/md5-cache/dev-haskell/criterion-0.6.2.1
+++ b/metadata/md5-cache/dev-haskell/criterion-0.6.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.3.2.12:=[profile?] >=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-haskell/hastache-0.5.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.10.0.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.2.1
 SRC_URI=mirror://hackage/packages/archive/criterion/0.6.2.1/criterion-0.6.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a05e32ef89ece1f04ae6c359702181f6
diff --git a/metadata/md5-cache/dev-haskell/criterion-0.8.0.0 b/metadata/md5-cache/dev-haskell/criterion-0.8.0.0
index 974c66f45921..2a44dd9405ff 100644
--- a/metadata/md5-cache/dev-haskell/criterion-0.8.0.0
+++ b/metadata/md5-cache/dev-haskell/criterion-0.8.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.3.2.12:=[profile?] >=dev-haskell/binary-0.6.3.0:=[profile?] >=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] >=dev-haskell/hastache-0.5.0:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/statistics-0.10.4.0:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8.0.0
 SRC_URI=mirror://hackage/packages/archive/criterion/0.8.0.0/criterion-0.8.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=498960c557700f57a5e6404234c0bdca
diff --git a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1 b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1
index 686afc4e4b65..86bd4775cf79 100644
--- a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1
+++ b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.2.5.1
 SRC_URI=mirror://hackage/packages/archive/Crypto/4.2.5.1/Crypto-4.2.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b696413540077216ec2fa6dfdfd7d784
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-0.12.2.2 b/metadata/md5-cache/dev-haskell/crypto-api-0.12.2.2
index 8228dde27d8f..f7e3049239fa 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-0.12.2.2
+++ b/metadata/md5-cache/dev-haskell/crypto-api-0.12.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.12.2.2
 SRC_URI=mirror://hackage/packages/archive/crypto-api/0.12.2.2/crypto-api-0.12.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2d08cc78bd4ec8a320c9a2681a492f8d
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11
index 556cd594781d..4daeb6c838ba 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.11
 SRC_URI=mirror://hackage/packages/archive/crypto-cipher-tests/0.0.11/crypto-cipher-tests-0.0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=548be2988248e963e40d3f807fb37fd5
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.7 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.7
index 4c2a918a05f8..8c2bd442146b 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.7
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.7
 SRC_URI=mirror://hackage/packages/archive/crypto-cipher-tests/0.0.7/crypto-cipher-tests-0.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=be5b7e715767f82c95c5f383c2d9ec66
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.5 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.5
index 83573d2949f3..0d3409bc4a7a 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.5
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.5
 SRC_URI=mirror://hackage/packages/archive/crypto-cipher-types/0.0.5/crypto-cipher-types-0.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f5a37a26bf27db5bb6419cc99a164d41
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
index e20bf2087a27..830c2bb92c69 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.9
 SRC_URI=mirror://hackage/packages/archive/crypto-cipher-types/0.0.9/crypto-cipher-types-0.0.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c073114036e1a237d3031be2e61fb0ef
diff --git a/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2 b/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2
index afe5c80f6aca..40d1ca2d3adc 100644
--- a/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2
+++ b/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2
@@ -10,5 +10,5 @@ RDEPEND==dev-haskell/cereal-0.3*:=[profile?] =dev-haskell/conduit-1.0*:=[profile
 RESTRICT=test
 SLOT=0/0.5.2
 SRC_URI=mirror://hackage/packages/archive/crypto-conduit/0.5.2/crypto-conduit-0.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a99adfc68c6b13d241b853648437d68a
diff --git a/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2.1 b/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2.1
index 6f1c8dc3866a..351ec6450e5b 100644
--- a/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2.1
+++ b/metadata/md5-cache/dev-haskell/crypto-conduit-0.5.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.13:=[profile?]
 SLOT=0/0.5.2.1
 SRC_URI=mirror://hackage/packages/archive/crypto-conduit/0.5.2.1/crypto-conduit-0.5.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d024dc1e7cbf06b3844f5d93ce924555
diff --git a/metadata/md5-cache/dev-haskell/crypto-numbers-0.1.3 b/metadata/md5-cache/dev-haskell/crypto-numbers-0.1.3
index d2eb2a6ec54b..68ba1d9ae8eb 100644
--- a/metadata/md5-cache/dev-haskell/crypto-numbers-0.1.3
+++ b/metadata/md5-cache/dev-haskell/crypto-numbers-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/crypto-random-api-0.2*:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/crypto-numbers/0.1.3/crypto-numbers-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7f299fabacfce63e6fbffe1db374b079
diff --git a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.1 b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.1
index e261dfd8a909..abbf616117fe 100644
--- a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.1
+++ b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/crypto-numbers/0.2.1/crypto-numbers-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2a18c16dbbb731292efdd66a098e8c30
diff --git a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.3 b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.3
index c6a415f6e71e..f43ecad9876b 100644
--- a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.3
+++ b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3
 SRC_URI=mirror://hackage/packages/archive/crypto-numbers/0.2.3/crypto-numbers-0.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=56c814c57e61eec2716bfaaaf106f73f
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.1.4 b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.1.4
index 95e821131246..04a5e9c7b15b 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.1.4
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/crypto-numbers:=[profile?] =dev-haskell/crypto-pubkey-types-0.4*:=[profile?] =dev-haskell/crypto-random-api-0.2*:=[profile?] >=dev-haskell/cryptohash-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.4
 SRC_URI=mirror://hackage/packages/archive/crypto-pubkey/0.1.4/crypto-pubkey-0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=88dbf763ee3a1a3f7336ada9a4e1dcd1
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.1 b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.1
index e934bdc4cd55..5f9489c4a2a8 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.1
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/crypto-pubkey/0.2.1/crypto-pubkey-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0f3cfa9cca55b59962393548b4a39be0
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.3 b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.3
index 7fe704ca818c..0d1a86b6e1db 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.3
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3
 SRC_URI=mirror://hackage/packages/archive/crypto-pubkey/0.2.3/crypto-pubkey-0.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=83d5c114236b72f5711a0bf46b65108e
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.0 b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.0
index 2b1124e05ef9..2d4aee5f8dcf 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.0
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0
 SRC_URI=mirror://hackage/packages/archive/crypto-pubkey-types/0.4.0/crypto-pubkey-types-0.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4c72246d80a53ca38aace905bba318b0
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.1 b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.1
index b6052c6972de..4acd3bf7cb6b 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.1
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1
 SRC_URI=mirror://hackage/packages/archive/crypto-pubkey-types/0.4.1/crypto-pubkey-types-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=72643a3b7fb2e2d9105273fe17310670
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-0.0.7 b/metadata/md5-cache/dev-haskell/crypto-random-0.0.7
index 1b545590be0f..bec386ad8620 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-0.0.7
+++ b/metadata/md5-cache/dev-haskell/crypto-random-0.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/securemem:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.7
 SRC_URI=mirror://hackage/packages/archive/crypto-random/0.0.7/crypto-random-0.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bf6760f3c8b3cbb63437dc15027dec1d
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0 b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
index 160fb1dd0dd6..a7afc8aaaef8 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
+++ b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/entropy:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/crypto-random-api/0.2.0/crypto-random-api-0.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=06649289f687a3f0dd1298a3b70bb098
diff --git a/metadata/md5-cache/dev-haskell/cryptocipher-0.5.2 b/metadata/md5-cache/dev-haskell/cryptocipher-0.5.2
index 728e5bf764a9..45314f867f98 100644
--- a/metadata/md5-cache/dev-haskell/cryptocipher-0.5.2
+++ b/metadata/md5-cache/dev-haskell/cryptocipher-0.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/cipher-aes:=[profile?] dev-haskell/cipher-rc4:=[profile?] =dev-haskell/cpu-0.1*:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.2
 SRC_URI=mirror://hackage/packages/archive/cryptocipher/0.5.2/cryptocipher-0.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fd0dd1f5839123aeffb2eec7e344288d
diff --git a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.1 b/metadata/md5-cache/dev-haskell/cryptocipher-0.6.1
index d381d6042e71..ecd63f9d1a62 100644
--- a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.1
+++ b/metadata/md5-cache/dev-haskell/cryptocipher-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] dev-haskell/cipher-blowfish:=[profile?] dev-haskell/cipher-camellia:=[profile?] dev-haskell/cipher-des:=[profile?] dev-haskell/cipher-rc4:=[profile?] dev-haskell/crypto-cipher-types:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1
 SRC_URI=mirror://hackage/packages/archive/cryptocipher/0.6.1/cryptocipher-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5fa0f735d4eba9de39508b51d16e22ab
diff --git a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2 b/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2
index 29ec8692e830..6d36a02b3b63 100644
--- a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2
+++ b/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?] >=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?] >=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?] >=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.2
 SRC_URI=mirror://hackage/packages/archive/cryptocipher/0.6.2/cryptocipher-0.6.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c26d338e8d058e2a0d31cb1aa4593833
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.10.0 b/metadata/md5-cache/dev-haskell/cryptohash-0.10.0
index 82ea4a07579a..de87a9436794 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.10.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.10.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.10.0
 SRC_URI=mirror://hackage/packages/archive/cryptohash/0.10.0/cryptohash-0.10.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0bd2584272de96a73c0c865597f9f9c8
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.11.1 b/metadata/md5-cache/dev-haskell/cryptohash-0.11.1
index c2882d9289f0..49a71a03b453 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.11.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.11.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11.1
 SRC_URI=mirror://hackage/packages/archive/cryptohash/0.11.1/cryptohash-0.11.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f4020747d6bd9bbcb41eab73bec33dd7
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.9.1 b/metadata/md5-cache/dev-haskell/cryptohash-0.9.1
index 93259a2974ee..96a1780739d8 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.9.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.9.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-lang/ghc-6.10.4:= cryptoapi? ( >=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] )
 SLOT=0/0.9.1
 SRC_URI=mirror://hackage/packages/archive/cryptohash/0.9.1/cryptohash-0.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f1e6ef4fd15ca8a0e4746aa3b6d6ec83
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.0 b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.0
index 17e8626b6adb..30600b0ca4eb 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.5:=[profile?] >=dev-haskell/cryptohash-0.8.0:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0
 SRC_URI=mirror://hackage/packages/archive/cryptohash-cryptoapi/0.1.0/cryptohash-cryptoapi-0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0bc1f1271f51c8fcb63fa91b30f059c1
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.1 b/metadata/md5-cache/dev-haskell/css-text-0.1.1
index ad74a417b122..75dbad58e621 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.1
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/css-text/0.1.1/css-text-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=55ec8b9db80b3b1cfebbcd2c749861ec
diff --git a/metadata/md5-cache/dev-haskell/curl-1.3.8 b/metadata/md5-cache/dev-haskell/curl-1.3.8
index a7a02386beb9..5e64ea058cad 100644
--- a/metadata/md5-cache/dev-haskell/curl-1.3.8
+++ b/metadata/md5-cache/dev-haskell/curl-1.3.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= net-misc/curl
 SLOT=0/1.3.8
 SRC_URI=mirror://hackage/packages/archive/curl/1.3.8/curl-1.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fb5d5d017410c6850e20e16e1cab9b7c
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.2.1 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.2.1
index d6e2de123e47..1e685e9042c1 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.2.1
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<dev-haskell/binary-0.6 >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/data-binary-ieee754/0.4.2.1/data-binary-ieee754-0.4.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4cbb0bd50d71063e0e75b91b4548f7cb
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.3 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.3
index 94c78f7ce66b..000e54ba5127 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.3
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.3
 SRC_URI=mirror://hackage/packages/archive/data-binary-ieee754/0.4.3/data-binary-ieee754-0.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b5dc929b8a8af15f7bc37501eb3a6b5e
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
index 40cf4553d261..d566255a2cfb 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/data-binary-ieee754/0.4.4/data-binary-ieee754-0.4.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab6bad0033d3f4d232a61ce5ef43f14b
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.5.3 b/metadata/md5-cache/dev-haskell/data-default-0.5.3
index 259a4ee34dd4..323cead66d74 100644
--- a/metadata/md5-cache/dev-haskell/data-default-0.5.3
+++ b/metadata/md5-cache/dev-haskell/data-default-0.5.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/data-default-instances-base:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.3
 SRC_URI=mirror://hackage/packages/archive/data-default/0.5.3/data-default-0.5.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b69601ad4460529d6ee1348d696b509b
diff --git a/metadata/md5-cache/dev-haskell/data-default-class-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-class-0.0.1
index b197dcf89fe4..e4f811622a88 100644
--- a/metadata/md5-cache/dev-haskell/data-default-class-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-class-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-default-class/0.0.1/data-default-class-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=23e96b83ed893f41f409d36e69dcc184
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.0.1
index 3eade273e127..3a33d4cc4678 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-default-instances-base/0.0.1/data-default-instances-base-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4f1795f650bdae0a9bc2f62b017bec9e
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
index 18f00886b236..fb8134d5f5ee 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-default-instances-containers/0.0.1/data-default-instances-containers-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f62b6bb649e83e8e5544e55be08b0cec
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
index b9a1833bc7ca..8cd2e84979bd 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-default-instances-dlist/0.0.1/data-default-instances-dlist-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=351848ff9338be30b19c33a1949558cf
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
index d2bbc9d3ec4e..ef34b5f6a096 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-default-instances-old-locale/0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b0e1acfff2edbbd56be2b180b697bd84
diff --git a/metadata/md5-cache/dev-haskell/data-endian-0.0.1 b/metadata/md5-cache/dev-haskell/data-endian-0.0.1
index 97d6ddcbc5b0..74eff935d4d5 100644
--- a/metadata/md5-cache/dev-haskell/data-endian-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-endian-0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.1
 SRC_URI=mirror://hackage/packages/archive/data-endian/0.0.1/data-endian-0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b0ecd56006a04a8d4536dc2a016b4ac7
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.3 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.3
index 51a92e5edf32..6deb68299fb3 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.3
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.3/dataenc-0.14.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f7c31199057f69f79f0c95eb6b1f4ac2
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.4 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.4
index 3531d82c1b94..5c1f04848fc4 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.4
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.14.0.4
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.4/dataenc-0.14.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a7b3dd95705380db0b807f37ad32f10c
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
index bbeb28cffb7f..2f78d5cd0958 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.14.0.5
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.5/dataenc-0.14.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f9d221442194fd0135bdde4597b63182
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5-r1 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5-r1
index 4e3fdf7844c6..3b2f6abc57ef 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.14.0.5
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.5/dataenc-0.14.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e47cd4e602eb99114a4b39d70556e377
diff --git a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1 b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
index 803689e395d2..7aae159a62a5 100644
--- a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/date-cache/0.3.0/date-cache-0.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e59bc6dd27064786b291ddf0f78babc
diff --git a/metadata/md5-cache/dev-haskell/dav-0.4.1 b/metadata/md5-cache/dev-haskell/dav-0.4.1
index 61c1bfb821b8..0881a2af5afa 100644
--- a/metadata/md5-cache/dev-haskell/dav-0.4.1
+++ b/metadata/md5-cache/dev-haskell/dav-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-conduit-1.9.0:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.1
 SRC_URI=mirror://hackage/packages/archive/DAV/0.4.1/DAV-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e21f0c506b22f2612f5d87c114bb650
diff --git a/metadata/md5-cache/dev-haskell/dav-0.5 b/metadata/md5-cache/dev-haskell/dav-0.5
index e294e28cecd9..a5c08c2e1fa7 100644
--- a/metadata/md5-cache/dev-haskell/dav-0.5
+++ b/metadata/md5-cache/dev-haskell/dav-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] >=dev-haskell/http-conduit-2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5
 SRC_URI=mirror://hackage/packages/archive/DAV/0.5/DAV-0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=36b9627925a387e4bddeaa6fae9997e1
diff --git a/metadata/md5-cache/dev-haskell/dbus-0.10.4 b/metadata/md5-cache/dev-haskell/dbus-0.10.4
index 41b39c473ee4..4ca6eb1501b6 100644
--- a/metadata/md5-cache/dev-haskell/dbus-0.10.4
+++ b/metadata/md5-cache/dev-haskell/dbus-0.10.4
@@ -4,10 +4,10 @@ DESCRIPTION=A client library for the D-Bus IPC system.
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/haskell-dbus/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.4:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] >=dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.10.4
 SRC_URI=mirror://hackage/packages/archive/dbus/0.10.4/dbus-0.10.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8fd3fc107ac0340f753ddd441c2b220f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8d8e1662b1c746a4f322779091a0f837
diff --git a/metadata/md5-cache/dev-haskell/dbus-0.10.5-r1 b/metadata/md5-cache/dev-haskell/dbus-0.10.5-r1
index bc1872ebe1ad..6595d081e6d0 100644
--- a/metadata/md5-cache/dev-haskell/dbus-0.10.5-r1
+++ b/metadata/md5-cache/dev-haskell/dbus-0.10.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/network-2.2.3:=[profile?]
 SLOT=0/0.10.5
 SRC_URI=mirror://hackage/packages/archive/dbus/0.10.5/dbus-0.10.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=318f53e0e735490d4c335b651cd14152
diff --git a/metadata/md5-cache/dev-haskell/dbus-core-0.9.2.1 b/metadata/md5-cache/dev-haskell/dbus-core-0.9.2.1
index 9ad3eb43a95e..c3ad55a36e11 100644
--- a/metadata/md5-cache/dev-haskell/dbus-core-0.9.2.1
+++ b/metadata/md5-cache/dev-haskell/dbus-core-0.9.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/binary-0.4 <dev-haskell/binary-0.6 >=dev-haskell/data-binary-ieee754-0.3 <dev-haskell/data-binary-ieee754-0.5 =dev-haskell/libxml-sax-0.7* >=dev-haskell/network-2.2 <dev-haskell/network-2.4 >=dev-haskell/parsec-2.0 <dev-haskell/parsec-3.2 >=dev-haskell/text-0.11.1.5 <dev-haskell/text-0.12 >=dev-haskell/vector-0.7 <dev-haskell/vector-0.10 =dev-haskell/xml-types-0.3* >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/dbus-core/0.9.2.1/dbus-core-0.9.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=96115d5f76b915b7854d04308cf3bd5d
diff --git a/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r1 b/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r1
index 3c6930f0e55f..b4e55108721c 100644
--- a/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r1
+++ b/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.7:=[profile?] >=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.3
 SRC_URI=mirror://hackage/packages/archive/dbus-core/0.9.3/dbus-core-0.9.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab7cce90f475edc85ff1cef81961b014
diff --git a/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r2 b/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r2
index 75c831ae0afa..c10decc681d9 100644
--- a/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r2
+++ b/metadata/md5-cache/dev-haskell/dbus-core-0.9.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.3
 SRC_URI=mirror://hackage/packages/archive/dbus-core/0.9.3/dbus-core-0.9.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89e8ab570f2d16337d90ec6a3c6d90c4
diff --git a/metadata/md5-cache/dev-haskell/deepseq-1.1.0.2 b/metadata/md5-cache/dev-haskell/deepseq-1.1.0.2
index b022c0010dfa..5f138a3ce4af 100644
--- a/metadata/md5-cache/dev-haskell/deepseq-1.1.0.2
+++ b/metadata/md5-cache/dev-haskell/deepseq-1.1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/deepseq/1.1.0.2/deepseq-1.1.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9dc3150f70a06fb24b331617acec9036
diff --git a/metadata/md5-cache/dev-haskell/deepseq-1.3.0.0 b/metadata/md5-cache/dev-haskell/deepseq-1.3.0.0
index 9a6fea891823..05d38ae5e554 100644
--- a/metadata/md5-cache/dev-haskell/deepseq-1.3.0.0
+++ b/metadata/md5-cache/dev-haskell/deepseq-1.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/deepseq/1.3.0.0/deepseq-1.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=525762b5dce52bdc4cb589cec6b459b4
diff --git a/metadata/md5-cache/dev-haskell/deepseq-1.3.0.1 b/metadata/md5-cache/dev-haskell/deepseq-1.3.0.1
index f035c716a934..4443764d87c4 100644
--- a/metadata/md5-cache/dev-haskell/deepseq-1.3.0.1
+++ b/metadata/md5-cache/dev-haskell/deepseq-1.3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Deep evaluation of data structures
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/deepseq
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.0.1
 SRC_URI=mirror://hackage/packages/archive/deepseq/1.3.0.1/deepseq-1.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=84eb7336b14536a16b75692817ce87ff
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=739a7261b57c7de2e46462f076c58e36
diff --git a/metadata/md5-cache/dev-haskell/diff-0.1.3 b/metadata/md5-cache/dev-haskell/diff-0.1.3
index abbc8fa1b1bc..1332a814415b 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.1.3
+++ b/metadata/md5-cache/dev-haskell/diff-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Diff/0.1.3/Diff-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ce2f85166e29a0b63373aa289615d8f0
diff --git a/metadata/md5-cache/dev-haskell/diff-0.3.0 b/metadata/md5-cache/dev-haskell/diff-0.3.0
index a9f4cf9b1087..83a3ba35977d 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.3.0
+++ b/metadata/md5-cache/dev-haskell/diff-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/Diff/0.3.0/Diff-0.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=efd72a12b04d9c60e587d556a95d6248
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index acd1fe6ada99..f0dd6bd9c54a 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=mirror://hackage/packages/archive/digest/0.0.1.2/digest-0.0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c79328eaf94250816d66c98122ef65a7
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.3.1 b/metadata/md5-cache/dev-haskell/distributive-0.3.1
index 243f08039d03..e08a52b4a231 100644
--- a/metadata/md5-cache/dev-haskell/distributive-0.3.1
+++ b/metadata/md5-cache/dev-haskell/distributive-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/transformers-compat-0.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/distributive/0.3.1/distributive-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=597673844d250b6a4ef7c34c01e66ac9
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.3.2 b/metadata/md5-cache/dev-haskell/distributive-0.3.2
index c3e11a784206..fdcd0ef86f03 100644
--- a/metadata/md5-cache/dev-haskell/distributive-0.3.2
+++ b/metadata/md5-cache/dev-haskell/distributive-0.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2
 SRC_URI=mirror://hackage/packages/archive/distributive/0.3.2/distributive-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2105ab34206d25be6646fea02b575419
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.5 b/metadata/md5-cache/dev-haskell/dlist-0.5
index 19a03f5bbca0..9c4db62b86bb 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.5
+++ b/metadata/md5-cache/dev-haskell/dlist-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/dlist/0.5/dlist-0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89c3d2e780b8b938b04a835791e5c7c4
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.5-r1 b/metadata/md5-cache/dev-haskell/dlist-0.5-r1
index ef4debeb4d6b..1e604e7e1ade 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.5-r1
+++ b/metadata/md5-cache/dev-haskell/dlist-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5
 SRC_URI=mirror://hackage/packages/archive/dlist/0.5/dlist-0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d0228182c22d4e22d853979828c3a1f
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.6.0.1 b/metadata/md5-cache/dev-haskell/dlist-0.6.0.1
index e9b504f95fc9..c498c399422f 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.6.0.1
+++ b/metadata/md5-cache/dev-haskell/dlist-0.6.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.0.1
 SRC_URI=mirror://hackage/packages/archive/dlist/0.6.0.1/dlist-0.6.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5fa963809bab458cc57f5781caef155c
diff --git a/metadata/md5-cache/dev-haskell/dns-0.3.8 b/metadata/md5-cache/dev-haskell/dns-0.3.8
index 4984a5b1009e..012a59c49caa 100644
--- a/metadata/md5-cache/dev-haskell/dns-0.3.8
+++ b/metadata/md5-cache/dev-haskell/dns-0.3.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] dev-haskell/binary:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/iproute-1.2.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-bytestring:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/dns/0.3.8/dns-0.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a911129cecf3ead0103b2045667db0ad
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.9.7 b/metadata/md5-cache/dev-haskell/doctest-0.9.7
index b193e9d0ac80..b8b94dd46a32 100644
--- a/metadata/md5-cache/dev-haskell/doctest-0.9.7
+++ b/metadata/md5-cache/dev-haskell/doctest-0.9.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.7
 SRC_URI=mirror://hackage/packages/archive/doctest/0.9.7/doctest-0.9.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6ea2aa669421fafc2e72f0517d81d1b7
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.9.9 b/metadata/md5-cache/dev-haskell/doctest-0.9.9
index c516fd7bebe5..777c41517fb8 100644
--- a/metadata/md5-cache/dev-haskell/doctest-0.9.9
+++ b/metadata/md5-cache/dev-haskell/doctest-0.9.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.9
 SRC_URI=mirror://hackage/packages/archive/doctest/0.9.9/doctest-0.9.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c5c3510879a33a02b13b3f30e9bd5254
diff --git a/metadata/md5-cache/dev-haskell/drift-2.2.0 b/metadata/md5-cache/dev-haskell/drift-2.2.0
index 06bcd925b130..4af298afed78 100644
--- a/metadata/md5-cache/dev-haskell/drift-2.2.0
+++ b/metadata/md5-cache/dev-haskell/drift-2.2.0
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://repetae.net/john/computer/haskell/DrIFT/drop/DrIFT-2.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ad612040670c681fcd122869a91299b7
diff --git a/metadata/md5-cache/dev-haskell/drift-2.2.3 b/metadata/md5-cache/dev-haskell/drift-2.2.3
index db4dbbef6cbf..2e7459bc50e0 100644
--- a/metadata/md5-cache/dev-haskell/drift-2.2.3
+++ b/metadata/md5-cache/dev-haskell/drift-2.2.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://repetae.net/john/computer/haskell/DrIFT/drop/DrIFT-2.2.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=62465d230be36a244ab81e7b20c8ef0b
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1
index 0a3ed5bae10c..70b3c67be598 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/random-1.0[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/edit-distance/0.2.1/edit-distance-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2ce6ed367c2841f50ce192d739b32813
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.1-r1
index 702244616f00..0f30931fb831 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.1
 SRC_URI=mirror://hackage/packages/archive/edit-distance/0.2.1.1/edit-distance-0.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=608a30e60e849490f38287861773e612
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.2 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.2
index 51fa02102cc3..2c50198bd66c 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.2
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.2
 SRC_URI=mirror://hackage/packages/archive/edit-distance/0.2.1.2/edit-distance-0.2.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1e5976c85c3a97a9e5cca653d95b2d74
diff --git a/metadata/md5-cache/dev-haskell/editline-0.2.1.0 b/metadata/md5-cache/dev-haskell/editline-0.2.1.0
index 30bf97b0a772..b6af6eecab30 100644
--- a/metadata/md5-cache/dev-haskell/editline-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/editline-0.2.1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-libs/libedit
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/editline/0.2.1.0/editline-0.2.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d9a4b7dbe2645a248c80b3e3cf79aa2a
diff --git a/metadata/md5-cache/dev-haskell/editline-0.2.1.1 b/metadata/md5-cache/dev-haskell/editline-0.2.1.1
index 687f1acab675..b7a872cd9f50 100644
--- a/metadata/md5-cache/dev-haskell/editline-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/editline-0.2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit
 SLOT=0/0.2.1.1
 SRC_URI=mirror://hackage/packages/archive/editline/0.2.1.1/editline-0.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=68358ff6c905c651e301de25b59e4c27
diff --git a/metadata/md5-cache/dev-haskell/email-validate-1.0.0 b/metadata/md5-cache/dev-haskell/email-validate-1.0.0
index 1a265edbd137..c61cc5fa1cd0 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-1.0.0
+++ b/metadata/md5-cache/dev-haskell/email-validate-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/email-validate/1.0.0/email-validate-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a8dce84859c97bdec7a3a3d1c9aaccec
diff --git a/metadata/md5-cache/dev-haskell/encoding-0.6.7.2-r2 b/metadata/md5-cache/dev-haskell/encoding-0.6.7.2-r2
index 2b40d992612a..233b2f33445f 100644
--- a/metadata/md5-cache/dev-haskell/encoding-0.6.7.2-r2
+++ b/metadata/md5-cache/dev-haskell/encoding-0.6.7.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.25:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.7.2
 SRC_URI=mirror://hackage/packages/archive/encoding/0.6.7.2/encoding-0.6.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=136dd12205cf2a8a9eaacb791aa604c7
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.2.2.2 b/metadata/md5-cache/dev-haskell/entropy-0.2.2.2
index ed843aaa83d9..c0c9456f2a90 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.2.2.2
+++ b/metadata/md5-cache/dev-haskell/entropy-0.2.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2.2
 SRC_URI=mirror://hackage/packages/archive/entropy/0.2.2.2/entropy-0.2.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a97dcc4fe858d0f2f668190ac2523008
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.2.2.4 b/metadata/md5-cache/dev-haskell/entropy-0.2.2.4
index 2d36410de49a..91d1d4424693 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.2.2.4
+++ b/metadata/md5-cache/dev-haskell/entropy-0.2.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2.4
 SRC_URI=mirror://hackage/packages/archive/entropy/0.2.2.4/entropy-0.2.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e7e51a4ad8e56d4df761fa95e064bf7
diff --git a/metadata/md5-cache/dev-haskell/enumerator-0.4.20 b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
index e1aef52969b6..388e5d6287a7 100644
--- a/metadata/md5-cache/dev-haskell/enumerator-0.4.20
+++ b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.20
 SRC_URI=mirror://hackage/packages/archive/enumerator/0.4.20/enumerator-0.4.20.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d72d8f51ab11d59df63ef7f5a55b30dc
diff --git a/metadata/md5-cache/dev-haskell/erf-2.0.0.0 b/metadata/md5-cache/dev-haskell/erf-2.0.0.0
index c04dd9c89984..5a6358e6310b 100644
--- a/metadata/md5-cache/dev-haskell/erf-2.0.0.0
+++ b/metadata/md5-cache/dev-haskell/erf-2.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/erf/2.0.0.0/erf-2.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c5d208317617e9dff452e54af73dc601
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index 720474d857fe..59e0bfbb4067 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.4
 SRC_URI=mirror://hackage/packages/archive/extensible-exceptions/0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f8ff4f03c973df257d5f5f24c45fe3e1
diff --git a/metadata/md5-cache/dev-haskell/failure-0.2.0.1 b/metadata/md5-cache/dev-haskell/failure-0.2.0.1
index 90e65c838f36..e062953bb9d2 100644
--- a/metadata/md5-cache/dev-haskell/failure-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/failure-0.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2[profile?] <dev-haskell/transformers-0.4[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/failure/0.2.0.1/failure-0.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=47ce9bf9f839566b47277dfae3c11ff4
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-0.3.3 b/metadata/md5-cache/dev-haskell/fast-logger-0.3.3
index 7bb0e5960cf3..aa30730b1324 100644
--- a/metadata/md5-cache/dev-haskell/fast-logger-0.3.3
+++ b/metadata/md5-cache/dev-haskell/fast-logger-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/date-cache-0.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unix-time-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/fast-logger/0.3.3/fast-logger-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=07bbfcc2835e34f1785d4d03e5ba845a
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-2.0.0 b/metadata/md5-cache/dev-haskell/fast-logger-2.0.0
index 11da0e76e047..62ffd5c0c434 100644
--- a/metadata/md5-cache/dev-haskell/fast-logger-2.0.0
+++ b/metadata/md5-cache/dev-haskell/fast-logger-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.0
 SRC_URI=mirror://hackage/packages/archive/fast-logger/2.0.0/fast-logger-2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0b834357c37ea59bd7b46661e20092aa
diff --git a/metadata/md5-cache/dev-haskell/feed-0.3.8-r1 b/metadata/md5-cache/dev-haskell/feed-0.3.8-r1
index ffb2590ade0a..8b1f389070b3 100644
--- a/metadata/md5-cache/dev-haskell/feed-0.3.8-r1
+++ b/metadata/md5-cache/dev-haskell/feed-0.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-1.2.6:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/feed/0.3.8/feed-0.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=20450af0a9de36b88ebb039391c9fa14
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4 b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
index ed0df389710b..2ec74f176c9e 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
+++ b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/fgl/5.4.2.4/fgl-5.4.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9244a6ac472377798c810be92d3b8f05
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.4.7 b/metadata/md5-cache/dev-haskell/file-embed-0.0.4.7
index 114cfb22ad51..30dd1118d480 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.4.7
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.4.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.4.7
 SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.4.7/file-embed-0.0.4.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=14d2317603e89c440387eac0e2266892
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.4.9 b/metadata/md5-cache/dev-haskell/file-embed-0.0.4.9
index c8be65a87ece..f724f0004681 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.4.9
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.4.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.4.9
 SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.4.9/file-embed-0.0.4.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=13d1fe0ccfe9a6399c21931e583a1ee6
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.6 b/metadata/md5-cache/dev-haskell/file-embed-0.0.6
index f90d35336262..790c399a825e 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.6
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.6
 SRC_URI=mirror://hackage/packages/archive/file-embed/0.0.6/file-embed-0.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7102852159c340eeec319be452699419
diff --git a/metadata/md5-cache/dev-haskell/file-location-0.4.5.2 b/metadata/md5-cache/dev-haskell/file-location-0.4.5.2
index 123c4fc3ebe7..e4f6236645d5 100644
--- a/metadata/md5-cache/dev-haskell/file-location-0.4.5.2
+++ b/metadata/md5-cache/dev-haskell/file-location-0.4.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/lifted-base:=[profile?] >=dev-haskell/transformers-0.2:=[pro
 RESTRICT=test
 SLOT=0/0.4.5.2
 SRC_URI=mirror://hackage/packages/archive/file-location/0.4.5.2/file-location-0.4.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a0b1029fbe78c17cfa44dc0f71471010
diff --git a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.2 b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.2
index bb8385266cba..9830688b152b 100644
--- a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.2
+++ b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.6.2
 SRC_URI=mirror://hackage/packages/archive/filemanip/0.3.6.2/filemanip-0.3.6.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0cd36fa3aefc2b7e64ec8acac5546417
diff --git a/metadata/md5-cache/dev-haskell/filestore-0.6.0.1 b/metadata/md5-cache/dev-haskell/filestore-0.6.0.1
index b63a71f4e5ae..5b4a9e41fca4 100644
--- a/metadata/md5-cache/dev-haskell/filestore-0.6.0.1
+++ b/metadata/md5-cache/dev-haskell/filestore-0.6.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] =dev-haskell/utf8-string-0.3*:=[profile?] =dev-haskell/xml-1.3*:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.0.1
 SRC_URI=mirror://hackage/packages/archive/filestore/0.6.0.1/filestore-0.6.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7898b3b2917d6dfff30a7c0244bf3a13
diff --git a/metadata/md5-cache/dev-haskell/filesystem-conduit-1.0.0.1 b/metadata/md5-cache/dev-haskell/filesystem-conduit-1.0.0.1
index 7db5daaac5ab..10cb95ab8c32 100644
--- a/metadata/md5-cache/dev-haskell/filesystem-conduit-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/filesystem-conduit-1.0.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/system-fileio-0.3.3:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.3:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.1
 SRC_URI=mirror://hackage/packages/archive/filesystem-conduit/1.0.0.1/filesystem-conduit-1.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b6a003ef4ed407dc50615457e65a42e4
diff --git a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1 b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
index 9498de48a191..939344a68344 100644
--- a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.5
 SRC_URI=mirror://hackage/packages/archive/FindBin/0.0.5/FindBin-0.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c50268d878cd608aad5b441597a4ce2a
diff --git a/metadata/md5-cache/dev-haskell/free-4.2 b/metadata/md5-cache/dev-haskell/free-4.2
index 39ec92f1e6c3..0d39edb00eb4 100644
--- a/metadata/md5-cache/dev-haskell/free-4.2
+++ b/metadata/md5-cache/dev-haskell/free-4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.2
 SRC_URI=mirror://hackage/packages/archive/free/4.2/free-4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4247b9001ca28139e1e7251cb643b2c9
diff --git a/metadata/md5-cache/dev-haskell/frown-0.6.1-r1 b/metadata/md5-cache/dev-haskell/frown-0.6.1-r1
index a3694e2c7cc6..1660727240a1 100644
--- a/metadata/md5-cache/dev-haskell/frown-0.6.1-r1
+++ b/metadata/md5-cache/dev-haskell/frown-0.6.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd6a2b1a373a201f7be27cafc1767e46
diff --git a/metadata/md5-cache/dev-haskell/fsnotify-0.0.11 b/metadata/md5-cache/dev-haskell/fsnotify-0.0.11
index 474d1717e9fe..8539c8424c51 100644
--- a/metadata/md5-cache/dev-haskell/fsnotify-0.0.11
+++ b/metadata/md5-cache/dev-haskell/fsnotify-0.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hinotify-0.3.5:=[profile?] <dev-haskell/hinotify-0.4:=[profile?] >=dev-haskell/system-fileio-0.3.8:=[profile?] <dev-haskell/system-fileio-0.4:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.0.11
 SRC_URI=mirror://hackage/packages/archive/fsnotify/0.0.11/fsnotify-0.0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05c9d19e22be0dacb151a69f55b746d1
diff --git a/metadata/md5-cache/dev-haskell/generic-deriving-1.6.1 b/metadata/md5-cache/dev-haskell/generic-deriving-1.6.1
index 6aa60414100d..d10a280b2443 100644
--- a/metadata/md5-cache/dev-haskell/generic-deriving-1.6.1
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/1.6.1
 SRC_URI=mirror://hackage/packages/archive/generic-deriving/1.6.1/generic-deriving-1.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6bffa4f5069c60f7bd1c34d465b534e3
diff --git a/metadata/md5-cache/dev-haskell/generic-deriving-1.6.2 b/metadata/md5-cache/dev-haskell/generic-deriving-1.6.2
index f42001b76411..f6078a36e8e1 100644
--- a/metadata/md5-cache/dev-haskell/generic-deriving-1.6.2
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/1.6.2
 SRC_URI=mirror://hackage/packages/archive/generic-deriving/1.6.2/generic-deriving-1.6.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e14e7bee4de686c8a5c183acf439dceb
diff --git a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.3 b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.3
index 6de9704de751..02c10312c520 100644
--- a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.3
+++ b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.0.3
 SRC_URI=mirror://hackage/packages/archive/geniplate/0.6.0.3/geniplate-0.6.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5c93e03f4e36f997f1d5533d44399fdd
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
index b1901c67665d..ef75d2e7d888 100644
--- a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2:=
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ghc-paths/0.1.0.9/ghc-paths-0.1.0.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1fc4f9f1f1deb17912dc6ab4fef87d75
diff --git a/metadata/md5-cache/dev-haskell/gio-0.12.0 b/metadata/md5-cache/dev-haskell/gio-0.12.0
index 72e3b84aa6a5..7b86c29981d9 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.12.0
+++ b/metadata/md5-cache/dev-haskell/gio-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/glib-0.12*:0 dev-haskell/mtl >=dev-lang/ghc-6.10.1 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/gio/0.12.0/gio-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5cc6bb443561809dd6c6c25c2126c277
diff --git a/metadata/md5-cache/dev-haskell/gio-0.12.3 b/metadata/md5-cache/dev-haskell/gio-0.12.3
index 2054fb751ef8..01ebe3099c50 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.12.3
+++ b/metadata/md5-cache/dev-haskell/gio-0.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/glib-0.12*:0[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/gio/0.12.3/gio-0.12.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3a14048a59e1e1db3236252ace908612
diff --git a/metadata/md5-cache/dev-haskell/gio-0.12.4-r1 b/metadata/md5-cache/dev-haskell/gio-0.12.4-r1
index acf7e4016d5a..007d98ac3587 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.12.4-r1
+++ b/metadata/md5-cache/dev-haskell/gio-0.12.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the GIO.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/glib-0.12.0:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2
 SLOT=0/0.12.4
 SRC_URI=mirror://hackage/packages/archive/gio/0.12.4/gio-0.12.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fd37f4d258c1bf9984e776112897592f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=7a10e11e2b9cd188357d7ca087a8e5cd
diff --git a/metadata/md5-cache/dev-haskell/gio-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/gio-0.12.5.0-r1
index bd5a3f4fb730..804ca3dd59d6 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/gio-0.12.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/glib-0.12.5:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2
 SLOT=0/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/gio/0.12.5.0/gio-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=51bb26214f8a36f988d5aba0a50046d3
diff --git a/metadata/md5-cache/dev-haskell/glade-0.12.0 b/metadata/md5-cache/dev-haskell/glade-0.12.0
index 55676eab2ddf..a53f9c68c125 100644
--- a/metadata/md5-cache/dev-haskell/glade-0.12.0
+++ b/metadata/md5-cache/dev-haskell/glade-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/cairo-0.12*:0 =dev-haskell/glib-0.12*:0 =dev-haskell/gtk-0.12*:2 dev-haskell/mtl =dev-haskell/pango-0.12*:0 >=dev-lang/ghc-6.10.1 gnome-base/libglade:2.0
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/glade/0.12.0/glade-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6021117d6568c8eec44f454fe823ff92
diff --git a/metadata/md5-cache/dev-haskell/glade-0.12.1 b/metadata/md5-cache/dev-haskell/glade-0.12.1
index e5e771990b1b..59c626e9a23b 100644
--- a/metadata/md5-cache/dev-haskell/glade-0.12.1
+++ b/metadata/md5-cache/dev-haskell/glade-0.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/glib-0.12*:0[profile?] =dev-haskell/gtk-0.12*:2[profile?] >=dev-lang/ghc-6.10.1 gnome-base/libglade:2.0
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/glade/0.12.1/glade-0.12.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=60068c433d9e2024ab74819519d14131
diff --git a/metadata/md5-cache/dev-haskell/glade-0.12.1-r1 b/metadata/md5-cache/dev-haskell/glade-0.12.1-r1
index cd0fdf700c60..da40c860538d 100644
--- a/metadata/md5-cache/dev-haskell/glade-0.12.1-r1
+++ b/metadata/md5-cache/dev-haskell/glade-0.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/glib-0.12*:0=[profile?] =dev-haskell/gtk-0.12*:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0
 SLOT=2/0.12.1
 SRC_URI=mirror://hackage/packages/archive/glade/0.12.1/glade-0.12.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5cc1b4f28c5edc7f4c7bf91b00aa8e53
diff --git a/metadata/md5-cache/dev-haskell/glade-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/glade-0.12.5.0-r1
index 991c1514b1d1..a67e434d7f54 100644
--- a/metadata/md5-cache/dev-haskell/glade-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/glade-0.12.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] >=dev-haskell/gtk-0.12.5.0:2=[profile?] <dev-haskell/gtk-0.13:2=[profile?] >=dev-lang/ghc-6.10.4:= gnome-base/libglade:2.0
 SLOT=2/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/glade/0.12.5.0/glade-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ee66580883b049740c6394bc11006d63
diff --git a/metadata/md5-cache/dev-haskell/glib-0.12.0 b/metadata/md5-cache/dev-haskell/glib-0.12.0
index 48088f9561c0..ed391db7dbf0 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.12.0
+++ b/metadata/md5-cache/dev-haskell/glib-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.1 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/glib/0.12.0/glib-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1938f0cedb96e4d119dc2ab2a92ce68d
diff --git a/metadata/md5-cache/dev-haskell/glib-0.12.3.1 b/metadata/md5-cache/dev-haskell/glib-0.12.3.1
index b723b894957b..3f15a341abf2 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/glib-0.12.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.1 dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/glib/0.12.3.1/glib-0.12.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2d29dee10deaf265127f89df2818f15
diff --git a/metadata/md5-cache/dev-haskell/glib-0.12.4-r1 b/metadata/md5-cache/dev-haskell/glib-0.12.4-r1
index 2765f793266f..0b298fb49601 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.12.4-r1
+++ b/metadata/md5-cache/dev-haskell/glib-0.12.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the GLIB library for Gtk2Hs.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/glib:2
 SLOT=0/0.12.4
 SRC_URI=mirror://hackage/packages/archive/glib/0.12.4/glib-0.12.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=88cb4c7fd32ac6bb8d284257c4aaa949
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ee717c4237e5c93563419a656e370fec
diff --git a/metadata/md5-cache/dev-haskell/glib-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/glib-0.12.5.0-r1
index cadf8f1edb0a..0c51348434e5 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/glib-0.12.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2
 SLOT=0/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/glib/0.12.5.0/glib-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a7c8a1ce15b92c46bc8957266e2c80ef
diff --git a/metadata/md5-cache/dev-haskell/glob-0.7.2 b/metadata/md5-cache/dev-haskell/glob-0.7.2
index ab59cd95ae1c..4abb3d1ea725 100644
--- a/metadata/md5-cache/dev-haskell/glob-0.7.2
+++ b/metadata/md5-cache/dev-haskell/glob-0.7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.2
 SRC_URI=mirror://hackage/packages/archive/Glob/0.7.2/Glob-0.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f60e7292e3fa8673fc12c716c33a42a5
diff --git a/metadata/md5-cache/dev-haskell/glob-0.7.3 b/metadata/md5-cache/dev-haskell/glob-0.7.3
index 9f3b6b3a2994..291bd9be7121 100644
--- a/metadata/md5-cache/dev-haskell/glob-0.7.3
+++ b/metadata/md5-cache/dev-haskell/glob-0.7.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.3
 SRC_URI=mirror://hackage/packages/archive/Glob/0.7.3/Glob-0.7.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d709e5db99019e9c238e5b94d18a5997
diff --git a/metadata/md5-cache/dev-haskell/gluraw-1.2.0.0 b/metadata/md5-cache/dev-haskell/gluraw-1.2.0.0
index 69ae332e5aa5..7665cd5d965e 100644
--- a/metadata/md5-cache/dev-haskell/gluraw-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/gluraw-1.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/openglraw-1.2*[profile?] >=dev-lang/ghc-6.8.2 virtual/glu
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/GLURaw/1.2.0.0/GLURaw-1.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c7c41ab503afdfce3d3fb0f146d85720
diff --git a/metadata/md5-cache/dev-haskell/gluraw-1.3.0.0 b/metadata/md5-cache/dev-haskell/gluraw-1.3.0.0
index 4a49b4a58a31..6da79465dee5 100644
--- a/metadata/md5-cache/dev-haskell/gluraw-1.3.0.0
+++ b/metadata/md5-cache/dev-haskell/gluraw-1.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.10.4:= virtual/glu
 SLOT=0/1.3.0.0
 SRC_URI=mirror://hackage/packages/archive/GLURaw/1.3.0.0/GLURaw-1.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9c831507e14d1f78098927dd5b5a132a
diff --git a/metadata/md5-cache/dev-haskell/glut-2.1.1.1 b/metadata/md5-cache/dev-haskell/glut-2.1.1.1
index 1ecb9e075c99..cb7d3621db7e 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.1.1.1
+++ b/metadata/md5-cache/dev-haskell/glut-2.1.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.4 >=dev-haskell/opengl-2.2.1 virtual/opengl media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/GLUT/2.1.1.1/GLUT-2.1.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d2279839746844d5687454a863db90f6
diff --git a/metadata/md5-cache/dev-haskell/glut-2.1.1.2 b/metadata/md5-cache/dev-haskell/glut-2.1.1.2
index 785e59f62feb..d8336c246b41 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.1.1.2
+++ b/metadata/md5-cache/dev-haskell/glut-2.1.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/opengl-2.2 virtual/opengl media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/GLUT/2.1.1.2/GLUT-2.1.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=903ece96ac027534bc358757119abb47
diff --git a/metadata/md5-cache/dev-haskell/glut-2.3.0.0 b/metadata/md5-cache/dev-haskell/glut-2.3.0.0
index acf276f8eae0..e85fc56c79d0 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.3.0.0
+++ b/metadata/md5-cache/dev-haskell/glut-2.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/opengl-2.5*[profile?] =dev-haskell/openglraw-1.2*[profile?] =dev-haskell/statevar-1.0*[profile?] =dev-haskell/tensor-1.0*[profile?] >=dev-lang/ghc-6.12.1 media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/GLUT/2.3.0.0/GLUT-2.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f6da6fb2e4fd3d81f8337b00e80236fe
diff --git a/metadata/md5-cache/dev-haskell/glut-2.3.1.0 b/metadata/md5-cache/dev-haskell/glut-2.3.1.0
index d0a6be0da1e6..bc5d3133616d 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.3.1.0
+++ b/metadata/md5-cache/dev-haskell/glut-2.3.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/opengl-2.6*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut
 SLOT=0/2.3.1.0
 SRC_URI=mirror://hackage/packages/archive/GLUT/2.3.1.0/GLUT-2.3.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=efcb655ba50a31bbb7801d7957663344
diff --git a/metadata/md5-cache/dev-haskell/glut-2.4.0.0 b/metadata/md5-cache/dev-haskell/glut-2.4.0.0
index 9c2d5f4fe3b0..bb84b759c9d6 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.4.0.0
+++ b/metadata/md5-cache/dev-haskell/glut-2.4.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/opengl-2.8*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut
 SLOT=0/2.4.0.0
 SRC_URI=mirror://hackage/packages/archive/GLUT/2.4.0.0/GLUT-2.4.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=050b0dad03e8d5f9499cf413dafa7a29
diff --git a/metadata/md5-cache/dev-haskell/gnuidn-0.2 b/metadata/md5-cache/dev-haskell/gnuidn-0.2
index 85264e162d8e..3f0c67f6a766 100644
--- a/metadata/md5-cache/dev-haskell/gnuidn-0.2
+++ b/metadata/md5-cache/dev-haskell/gnuidn-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= net-dns/libidn
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/gnuidn/0.2/gnuidn-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d018cbcddbacf028087176a7bae67fe
diff --git a/metadata/md5-cache/dev-haskell/gnutls-0.1.4 b/metadata/md5-cache/dev-haskell/gnutls-0.1.4
index ea2bb9f95568..6d52ceeb6e69 100644
--- a/metadata/md5-cache/dev-haskell/gnutls-0.1.4
+++ b/metadata/md5-cache/dev-haskell/gnutls-0.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-haskell/monads-tf-0.1*:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= net-libs/gnutls
 SLOT=0/0.1.4
 SRC_URI=mirror://hackage/packages/archive/gnutls/0.1.4/gnutls-0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b677c9617c69db377313832bd930ddf0
diff --git a/metadata/md5-cache/dev-haskell/groupoids-3.0.1.1 b/metadata/md5-cache/dev-haskell/groupoids-3.0.1.1
index 97e8f042b8d2..644c676af8d5 100644
--- a/metadata/md5-cache/dev-haskell/groupoids-3.0.1.1
+++ b/metadata/md5-cache/dev-haskell/groupoids-3.0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.0.1.1
 SRC_URI=mirror://hackage/packages/archive/groupoids/3.0.1.1/groupoids-3.0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b57151e8e48fa9cc0b3f829bc1d69c3f
diff --git a/metadata/md5-cache/dev-haskell/groupoids-4.0 b/metadata/md5-cache/dev-haskell/groupoids-4.0
index 7a56634447da..2d8282052dac 100644
--- a/metadata/md5-cache/dev-haskell/groupoids-4.0
+++ b/metadata/md5-cache/dev-haskell/groupoids-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/groupoids/4.0/groupoids-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9df006f67725f9c83c4e2b7f23c07fc9
diff --git a/metadata/md5-cache/dev-haskell/gsasl-0.3.5 b/metadata/md5-cache/dev-haskell/gsasl-0.3.5
index 907d98466471..de599e78ae8b 100644
--- a/metadata/md5-cache/dev-haskell/gsasl-0.3.5
+++ b/metadata/md5-cache/dev-haskell/gsasl-0.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= virtual/gsasl
 SLOT=0/0.3.5
 SRC_URI=mirror://hackage/packages/archive/gsasl/0.3.5/gsasl-0.3.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebd450daeb6434ad396cf8f9b527b98f
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.12.0 b/metadata/md5-cache/dev-haskell/gtk-0.12.0
index 107d5435ee0c..21d06655e1ea 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.12.0
+++ b/metadata/md5-cache/dev-haskell/gtk-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/cairo-0.12*:0 =dev-haskell/glib-0.12*:0 dev-haskell/mtl =dev-haskell/pango-0.12*:0 >=dev-lang/ghc-6.10.1 dev-libs/glib:2 x11-libs/gtk+:2 gio? ( =dev-haskell/gio-0.12*:0 )
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/gtk/0.12.0/gtk-0.12.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f135c40216c1d3c7a8c51156c165fced
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.12.4-r1 b/metadata/md5-cache/dev-haskell/gtk-0.12.4-r1
index 0ce37064b42f..959acdf8fdfe 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.12.4-r1
+++ b/metadata/md5-cache/dev-haskell/gtk-0.12.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the Gtk+ graphical user interface library.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=+gio doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.12.0:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/gio-0.12.0:0=[profile?] <dev-haskell/gio-0.13:0=[profile?] >=dev-haskell/glib-0.12.0:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.0:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( =dev-haskell/gio-0.12*:0[profile?] )
 SLOT=2/0.12.4
 SRC_URI=mirror://hackage/packages/archive/gtk/0.12.4/gtk-0.12.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9c6d96589ae091fe22c7ff90363ef0a5
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=86c88baa738e868f70b299df39375861
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.12.5.0.2 b/metadata/md5-cache/dev-haskell/gtk-0.12.5.0.2
index 2a5e007d9e96..f4c2a92782a5 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.12.5.0.2
+++ b/metadata/md5-cache/dev-haskell/gtk-0.12.5.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.12.5:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.12.5:0=[profile?] <dev-haskell/pango-0.13:0=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.12.5:0=[profile?] <dev-haskell/gio-0.13:0=[profile?] )
 SLOT=2/0.12.5.0.2
 SRC_URI=mirror://hackage/packages/archive/gtk/0.12.5.0/gtk-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a69aff19fe7ddbe592e8e1fffa25e66c
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.0 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.0
index 1db7ef8524f1..37f6d5256c9d 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.0
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.0/gtk2hs-buildtools-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7a4950574b66eb0887f380a76d8b72d7
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3-r3 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3-r3
index c9d0e6c8c2b0..60f71ba2b935 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3-r3
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3-r3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.3/gtk2hs-buildtools-0.12.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2772f578ae965a02a992ac0ff834f63d
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3.1 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3.1
index 2b723a3b2f0e..7e706fd7aacc 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3.1
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.3.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.3.1/gtk2hs-buildtools-0.12.3.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c7b283a609cad62dad7655601c9df506
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.4-r2 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.4-r2
index e3864b6d314f..94f42e803506 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.4-r2
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.4-r2
@@ -3,9 +3,9 @@ DEPEND=dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy dev-haskell/ha
 DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0/0.12.4
 SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.4/gtk2hs-buildtools-0.12.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=65e32f54c2b39ebbeedca45867e5b69a
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=045001423372475165ab00d607805287
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1
index 5a49eef80bee..cba5744dbcc2 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.12.5.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0/0.12.5.1
 SRC_URI=mirror://hackage/packages/archive/gtk2hs-buildtools/0.12.5.1/gtk2hs-buildtools-0.12.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3f0b858c585fe9fa67034ae2dd117b97
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2 b/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
index 5a6bb7837a90..d84b9ded01e3 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
+++ b/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.10.0/haddock-2.10.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3408893e0c14cd13f42c15add1d4b95e
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.13.1-r2 b/metadata/md5-cache/dev-haskell/haddock-2.13.1-r2
index c0cc70f64147..4924c02aadb4 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.13.1-r2
+++ b/metadata/md5-cache/dev-haskell/haddock-2.13.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?]
 RESTRICT=test
 SLOT=0/2.13.1
 SRC_URI=mirror://hackage/packages/archive/haddock/2.13.1/haddock-2.13.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=156cc7e1d407f12663338b7149fa67d7
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.13.2 b/metadata/md5-cache/dev-haskell/haddock-2.13.2
index f2b09552480c..b5b7d136a7d4 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.13.2
+++ b/metadata/md5-cache/dev-haskell/haddock-2.13.2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?]
 RESTRICT=test
 SLOT=0/2.13.2
 SRC_URI=mirror://hackage/packages/archive/haddock/2.13.2/haddock-2.13.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=54673cf41ebc74509b86a2aea3429ff0
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.13.2-r1 b/metadata/md5-cache/dev-haskell/haddock-2.13.2-r1
index 7ecd1dbe295a..6f6bb8c51f8d 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.13.2-r1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.13.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?]
 RESTRICT=test
 SLOT=0/2.13.2
 SRC_URI=mirror://hackage/packages/archive/haddock/2.13.2/haddock-2.13.2.tar.gz http://dev.gentoo.org/~qnikst/patches/dev-haskell-haddock/haddock-2.13.2-pregenerated-files.patch
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b85ece6d779e76cdd914a449b91abada
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.6.1 b/metadata/md5-cache/dev-haskell/haddock-2.6.1
index 04c0d7d3859a..bcb1c4f07a55 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.6.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.6.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12 <dev-lang/ghc-7
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.6.1/haddock-2.6.1.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d1fd9ee8e20a525561976d7499c749b
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.1 b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.1
index 9072b9f59234..c33cfd0690c0 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.1
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0.1:=[profile?] <dev-haskell/shakespeare-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.7.1
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.7.1/hamlet-1.1.7.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f439e5f956f9889c84287cb245084a88
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.2 b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.2
index ceb3b1cc26ea..87bc2cddfb89 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.2
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0.1:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.7.2
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.7.2/hamlet-1.1.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=169f493c212039cc8fbd7bc84c960e55
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.3 b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.3
index 6b5e8fdbe21c..f176cb0d61f3 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.3
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0.1:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.7.3
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.7.3/hamlet-1.1.7.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b034a3b3da95389fe13d916822ae1068
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.5 b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.5
index 9c324eaeca38..7c9491dde3c7 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.1.7.5
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0
 RESTRICT=test
 SLOT=0/1.1.7.5
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.7.5/hamlet-1.1.7.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=08be0a72342f994521a0048928cb2b67
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.1.7.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.1.7.1
index 2fcff81d820a..577942711146 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.1.7.1
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/base64-bytestring-1.0*:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/transformers-base-0.4*:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/network-2.2.3:=[profile?]
 SLOT=0/7.1.7.1
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.1.7.1/happstack-server-7.1.7.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a1b96451dae6d85ae6161b4c1c84a8f5
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.3.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.3.1
index 6eca77d5ba46..51c36a62b526 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.3.1
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/network-2.2.3:=[profile?]
 SLOT=0/7.3.1
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.3.1/happstack-server-7.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8132ef2e37c4d6c67a6acefbee99a244
diff --git a/metadata/md5-cache/dev-haskell/happy-1.18.10 b/metadata/md5-cache/dev-haskell/happy-1.18.10
index af798d14e27b..f83137472057 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.18.10
+++ b/metadata/md5-cache/dev-haskell/happy-1.18.10
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/happy/1.18.10/happy-1.18.10.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=753f48378d08994bb4148166f1565d10
diff --git a/metadata/md5-cache/dev-haskell/happy-1.18.9 b/metadata/md5-cache/dev-haskell/happy-1.18.9
index 43002dfe86b4..cacbba10aaec 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.18.9
+++ b/metadata/md5-cache/dev-haskell/happy-1.18.9
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/happy/1.18.9/happy-1.18.9.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1792e715a09a239cc9f27fa4565cdc55
diff --git a/metadata/md5-cache/dev-haskell/harp-0.4 b/metadata/md5-cache/dev-haskell/harp-0.4
index 5c876ac91926..34527a597c5f 100644
--- a/metadata/md5-cache/dev-haskell/harp-0.4
+++ b/metadata/md5-cache/dev-haskell/harp-0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/harp/0.4/harp-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=47fba0c548f2b8f332baa1020ae98f1b
diff --git a/metadata/md5-cache/dev-haskell/harp-0.4-r1 b/metadata/md5-cache/dev-haskell/harp-0.4-r1
index c8761745b26c..4572895cf887 100644
--- a/metadata/md5-cache/dev-haskell/harp-0.4-r1
+++ b/metadata/md5-cache/dev-haskell/harp-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/harp/0.4/harp-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=76c220a102488a2693538bd8f3f1bf72
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.1.2.2 b/metadata/md5-cache/dev-haskell/hashable-1.1.2.2
index 211e3114cd24..dca3e1a58b7d 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.1.2.2
+++ b/metadata/md5-cache/dev-haskell/hashable-1.1.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/text-0.11* >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashable/1.1.2.2/hashable-1.1.2.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=32a84f765622cec7ed0f2638c9347e74
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.1.2.3 b/metadata/md5-cache/dev-haskell/hashable-1.1.2.3
index 9b5a5d15d380..2fac36259e9d 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.1.2.3
+++ b/metadata/md5-cache/dev-haskell/hashable-1.1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/text-0.11* >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashable/1.1.2.3/hashable-1.1.2.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9df20f786abb24ccd199a690859cc980
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.1.2.5 b/metadata/md5-cache/dev-haskell/hashable-1.1.2.5
index 1d491bf66f29..75789b56810d 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.1.2.5
+++ b/metadata/md5-cache/dev-haskell/hashable-1.1.2.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.1:=
 SLOT=0/1.1.2.5
 SRC_URI=mirror://hackage/packages/archive/hashable/1.1.2.5/hashable-1.1.2.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=228dbf728bcc4c57f7516eb90174b3f0
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.0.10 b/metadata/md5-cache/dev-haskell/hashable-1.2.0.10
index 024e84ff20ce..e210204d851b 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.0.10
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/1.2.0.10
 SRC_URI=mirror://hackage/packages/archive/hashable/1.2.0.10/hashable-1.2.0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=87c05e5e1c14ed7c4ff1a1af062fe625
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.0.5 b/metadata/md5-cache/dev-haskell/hashable-1.2.0.5
index f5e75806f134..85b5a9bae306 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.0.5
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.5
 SRC_URI=mirror://hackage/packages/archive/hashable/1.2.0.5/hashable-1.2.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=426c885f1b7d7321bb15f55cdf5b9580
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.1.0 b/metadata/md5-cache/dev-haskell/hashable-1.2.1.0
index 47044526d13c..122ecc2498c8 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.1.0
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.1.0
 SRC_URI=mirror://hackage/packages/archive/hashable/1.2.1.0/hashable-1.2.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b8dd43e699f142cfaa66257843a9d301
diff --git a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.10 b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.10
index 48d75eb0a404..05835de5b438 100644
--- a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.10
+++ b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/dataenc:=[profile?] dev-haskell/extensible-exceptions:=[profile?] =dev-haskell/mmap-0.5*:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.10
 SRC_URI=mirror://hackage/packages/archive/hashed-storage/0.5.10/hashed-storage-0.5.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9efca016316fee35ac12cbda75c16cff
diff --git a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.9 b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.9
index 08661840d7d6..753827c9e4b5 100644
--- a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.9
+++ b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/binary[profile?] dev-haskell/dataenc[profile?] =dev-haskell/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashed-storage/0.5.9/hashed-storage-0.5.9.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9a0e3ff8dd67eccdd3a9ff19b8997b2b
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.2 b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.2
index b8c8c1b2cf24..98becefe0bc3 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.2
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/hashable-2[profile?] dev-haskell/primitive[profile?] >=dev-haskell/vector-0.7[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.0.1.2/hashtables-1.0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=df1fb8821d56e328d6786ca6294129ef
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.3 b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.3
index 80352ac472e1..19e5c1f022e4 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.3
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1[profile?] <dev-haskell/hashable-2[profile?] dev-haskell/primitive[profile?] >=dev-haskell/vector-0.7[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.0.1.3/hashtables-1.0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d4a5a69dc757e73aa16fb1e50d178a4e
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.6 b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.6
index d445d0162aee..caa7096584e8 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.6
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1[profile?] <dev-haskell/hashable-2[profile?] dev-haskell/primitive[profile?] >=dev-haskell/vector-0.7[profile?] <dev-haskell/vector-0.10[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.0.1.6/hashtables-1.0.1.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5bcd28ff60fa5f8a296537c86b459621
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.8 b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.8
index feba327d0718..ac8d0f5039a8 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.0.1.8
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.0.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.1.8
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.0.1.8/hashtables-1.0.1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4b9b690daa6c8c07bd2ee776c0ba2b12
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.1.0.2 b/metadata/md5-cache/dev-haskell/hashtables-1.1.0.2
index 34a277a5bd9a..b4cd5c74e869 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.1.0.2
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-2:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0.2
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.1.0.2/hashtables-1.1.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d3e2adabbfe89f50397eb027ca70b609
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.1.2.0 b/metadata/md5-cache/dev-haskell/hashtables-1.1.2.0
index fbefc059402f..03f0f7e95784 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.1.2.0
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-6.10.4:= || ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
 SLOT=0/1.1.2.0
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.1.2.0/hashtables-1.1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5fffd6c8919a8f5536bf43f59b3c1f77
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.1.2.1 b/metadata/md5-cache/dev-haskell/hashtables-1.1.2.1
index 453488af9d46..3a32848197d3 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.1.2.1
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Mutable hash tables in the ST monad
 EAPI=5
 HOMEPAGE=http://github.com/gregorycollins/hashtables
 IUSE=bounds-checking debug portable sse4_1 +unsafe-tricks doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-6.10.4:= || ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
 SLOT=0/1.1.2.1
 SRC_URI=mirror://hackage/packages/archive/hashtables/1.1.2.1/hashtables-1.1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d044410bd7ff1e273f05f7a132aec122
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=3e7140cbd20870cd7d4f35ee38dc9d89
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.6.4.6-r1 b/metadata/md5-cache/dev-haskell/haskeline-0.6.4.6-r1
index 2c8c391d2582..06bebe70afe0 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.6.4.6-r1
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.6.4.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/mtl-2.2[profile?] >=dev-haskell/terminfo-0.3.1.3[profile?] <dev-haskell/utf8-string-0.4[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.6.4.6/haskeline-0.6.4.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5b20c65e0ad0bfd4e65676e653f7db2e
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.6.4.7-r1 b/metadata/md5-cache/dev-haskell/haskeline-0.6.4.7-r1
index b5a8313bbc3e..06df90bbe442 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.6.4.7-r1
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.6.4.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.4:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.4.7
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.6.4.7/haskeline-0.6.4.7.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f3679fcee68536b3787cdf396e9d81c1
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.4 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.4
index 663b2f48787d..3b44aa20aa10 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.4
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-src/1.0.1.4/haskell-src-1.0.1.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3e234f60f4fcd96777484969c40e0465
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5
index e0ac3d2f14b5..8fcd6c0dec98 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-src/1.0.1.5/haskell-src-1.0.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4011dfa69830c5934c845cc2e80da106
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5-r1 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5-r1
index 435e54a4af21..62572fa09fcd 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.1.5
 SRC_URI=mirror://hackage/packages/archive/haskell-src/1.0.1.5/haskell-src-1.0.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2434c66ee6e21248c1f3533e488f9d07
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
index 71f6aa04cd8d..527d1011bea4 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.13.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.13.5
 SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.13.5/haskell-src-exts-1.13.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fdff133c6930d22e19fe992c76d956e6
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.14.0 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.14.0
index 69696c38d903..c41d2d653c69 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.14.0
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.14.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.14.0
 SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.14.0/haskell-src-exts-1.14.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9b45d6771f8cbe9f417d5a41fef189e7
diff --git a/metadata/md5-cache/dev-haskell/hastache-0.5.1 b/metadata/md5-cache/dev-haskell/hastache-0.5.1
index 58e022416cef..0cc3424f780a 100644
--- a/metadata/md5-cache/dev-haskell/hastache-0.5.1
+++ b/metadata/md5-cache/dev-haskell/hastache-0.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/ieee754:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1
 SRC_URI=mirror://hackage/packages/archive/hastache/0.5.1/hastache-0.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2a7f67a9d827a0f923d90500caa6e5db
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.13.2 b/metadata/md5-cache/dev-haskell/haxml-1.13.2
index a3d6d0fc6dfd..710a01bdef86 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.13.2
+++ b/metadata/md5-cache/dev-haskell/haxml-1.13.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.2 >=dev-haskell/cabal-1.1.3-r1
 SLOT=0
 SRC_URI=http://www.haskell.org/HaXml/HaXml-1.13.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2787e52965fb4c143bcc4ba9edb175fb
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.13.3 b/metadata/md5-cache/dev-haskell/haxml-1.13.3
index b1815d9042fc..2ecc02a66117 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.13.3
+++ b/metadata/md5-cache/dev-haskell/haxml-1.13.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.13.3/HaXml-1.13.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f609caed31dfa950a9ed57f22f001258
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.23 b/metadata/md5-cache/dev-haskell/haxml-1.23
index 26a446533305..59c557e34674 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.23
+++ b/metadata/md5-cache/dev-haskell/haxml-1.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.5[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.23/HaXml-1.23.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e59cff54123b5d2a95f30787b19558bb
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.23.2 b/metadata/md5-cache/dev-haskell/haxml-1.23.2
index cec7cd3db2af..3a369c51eee8 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.23.2
+++ b/metadata/md5-cache/dev-haskell/haxml-1.23.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.5[profile?] dev-haskell/random[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.23.2/HaXml-1.23.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=242f3f12fd35a9f75db0b71a7e524629
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.23.3 b/metadata/md5-cache/dev-haskell/haxml-1.23.3
index fb9dd2ad1d49..e88a81b9ba01 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.23.3
+++ b/metadata/md5-cache/dev-haskell/haxml-1.23.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.5:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.23.3
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.23.3/HaXml-1.23.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=83f264b75c5f004cd19c33321299e4db
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.24 b/metadata/md5-cache/dev-haskell/haxml-1.24
index 0eec501744c3..70c7e776e5e6 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.24
+++ b/metadata/md5-cache/dev-haskell/haxml-1.24
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.24
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.24/HaXml-1.24.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e6d91e857fca4d9efd8f2944bd9e8738
diff --git a/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2 b/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
index 09b5f4a2585e..b4662b1239ac 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
+++ b/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
@@ -10,5 +10,5 @@ PDEPEND=mysql? ( dev-haskell/hdbc-mysql ) odbc? ( =dev-haskell/hdbc-odbc-2.3* )
 RDEPEND=>=dev-haskell/convertible-1.0.10.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=2/2.3.1.2
 SRC_URI=mirror://hackage/packages/archive/HDBC/2.3.1.2/HDBC-2.3.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=52886e78a8e91e488c0716bad2eac55a
diff --git a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.6.6.1-r1 b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.6.6.1-r1
index 58d081067fdc..88c88fa14062 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.6.6.1-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.6.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.6.1
 SRC_URI=mirror://hackage/packages/archive/HDBC-mysql/0.6.6.1/HDBC-mysql-0.6.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3f3542b31dde1c83ec5ece43465e7ef2
diff --git a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.0 b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.0
index 8d71dafe90d7..6c75c72217f0 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.0
@@ -10,5 +10,5 @@ RDEPEND==dev-haskell/hdbc-2.3*[profile?] dev-haskell/mtl[profile?] dev-haskell/u
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/HDBC-odbc/2.3.1.0/HDBC-odbc-2.3.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e12c4607d28f113bb0a5b142a967f9c4
diff --git a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.1 b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.1
index e89d6518ddd4..5370c9996d95 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.1
+++ b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hdbc-2.1.0:=[profile?] dev-haskell/mtl:=[profile?] dev-has
 RESTRICT=test
 SLOT=2/2.3.1.1
 SRC_URI=mirror://hackage/packages/archive/HDBC-odbc/2.3.1.1/HDBC-odbc-2.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2e19bdba51f7e24143f10b6d0e0a4a45
diff --git a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.1 b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.1
index 89e2c7bf93cc..2e1e472b3e96 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.1
+++ b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.1
@@ -10,5 +10,5 @@ RDEPEND=>dev-db/postgresql-base-8 dev-haskell/convertible[profile?] =dev-haskell
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/HDBC-postgresql/2.3.2.1/HDBC-postgresql-2.3.2.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=175ac73833891326106aae721b93dc69
diff --git a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.2-r1 b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.2-r1
index f03e773f8474..a4efa0fd6869 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/postgresql-base-7 dev-haskell/convertible:=[profile?] dev-haske
 RESTRICT=test
 SLOT=2/2.3.2.2
 SRC_URI=mirror://hackage/packages/archive/HDBC-postgresql/2.3.2.2/HDBC-postgresql-2.3.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a9682c97cf35a9d353edc4e6d1b28eb3
diff --git a/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.0.0 b/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.0.0
index 4c480734b202..eb55baa6a534 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.0.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.0.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/hdbc-2.2 dev-haskell/mtl dev-haskell/u
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/HDBC-sqlite3/2.3.0.0/HDBC-sqlite3-2.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b5129522d7eb2bc26b9b547dbf5e13fb
diff --git a/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.3.0 b/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.3.0
index c80301f6b9e3..f483d73f76e3 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.3.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hdbc-2.3.0.0[profile?] dev-haskell/mtl[profile?] dev-haske
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/HDBC-sqlite3/2.3.3.0/HDBC-sqlite3-2.3.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=04ca1b4d6460e9e48c22a400edf59bc9
diff --git a/metadata/md5-cache/dev-haskell/hexpat-0.20.3 b/metadata/md5-cache/dev-haskell/hexpat-0.20.3
index bf37d65e949f..0ccfc48b3b24 100644
--- a/metadata/md5-cache/dev-haskell/hexpat-0.20.3
+++ b/metadata/md5-cache/dev-haskell/hexpat-0.20.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0:=[profile?] <dev-haskell/deepseq-1.4.0.0:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] dev-haskell/transformers:=[profile?] =dev-haskell/utf8-string-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.20.3
 SRC_URI=mirror://hackage/packages/archive/hexpat/0.20.3/hexpat-0.20.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dc0e1d3765ff4e1dc454c8616a4884f2
diff --git a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9 b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9
index 615147dd1118..03afac3b8555 100644
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] )
 SLOT=0/0.5.3.9
 SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.3.9/highlighting-kate-0.5.3.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=37ddd623ffa5294754c99cb9af5733fa
diff --git a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5 b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5
index f8127ec3b25c..5cb31e8ffaa9 100644
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] )
 SLOT=0/0.5.5
 SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.5/highlighting-kate-0.5.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9ce8ad5e0e2ebe6190f782b401e9090c
diff --git a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5.1 b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5.1
index 224b8e5e5ff1..296ca247aebe 100644
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5.1
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] )
 SLOT=0/0.5.5.1
 SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.5.1/highlighting-kate-0.5.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=696ad54548708d54e8df5a24426a06dd
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.2 b/metadata/md5-cache/dev-haskell/hinotify-0.3.2
index dc6a6b5dec25..f6b1338cba95 100644
--- a/metadata/md5-cache/dev-haskell/hinotify-0.3.2
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hinotify/0.3.2/hinotify-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=08c8558c23fdadf8910fc8cb9b48480f
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.5 b/metadata/md5-cache/dev-haskell/hinotify-0.3.5
index d01dfce900c1..eb9eb7db2b40 100644
--- a/metadata/md5-cache/dev-haskell/hinotify-0.3.5
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.0.1:=
 SLOT=0/0.3.5
 SRC_URI=mirror://hackage/packages/archive/hinotify/0.3.5/hinotify-0.3.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d1b23a869125c3b9e705c9aeebfb0897
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.1 b/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.1
index 6464f4a7842c..6aec7a21672e 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.1
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-1:=[profile?] >=dev-haskell/language-javascript-0.5.1:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.4.1
 SRC_URI=mirror://hackage/packages/archive/hjsmin/0.1.4.1/hjsmin-0.1.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cf38e8fe4d7a774dcc03dc513326bf38
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.4 b/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.4
index 9ac77df616e4..0a0a83e3592d 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.4
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.1.4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-1:=[profile?] >=dev-haskell/language-javascript-0.5.1:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.4.4
 SRC_URI=mirror://hackage/packages/archive/hjsmin/0.1.4.4/hjsmin-0.1.4.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ff27b24fc9c43460ef7db08594aacac9
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0 b/metadata/md5-cache/dev-haskell/hostname-1.0
index 3af6eb8ced39..e3160dc3fcac 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hostname/1.0/hostname-1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eadea9e9b59cc47f9cfbe3a944f06f5d
diff --git a/metadata/md5-cache/dev-haskell/hpc-0.5.1.1 b/metadata/md5-cache/dev-haskell/hpc-0.5.1.1
index 0b30dcc7a01f..e385c16c0d28 100644
--- a/metadata/md5-cache/dev-haskell/hpc-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/hpc-0.5.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hpc/0.5.1.1/hpc-0.5.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b7d32167d6ba90939d2a630aace7f5be
diff --git a/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1 b/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1
index 805e3aac21e9..f38090f787b9 100644
--- a/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.0.0
 SRC_URI=mirror://hackage/packages/archive/hpc/0.6.0.0/hpc-0.6.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f4e797c5dc5149e16fbc137fc1af9ba4
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-4.12 b/metadata/md5-cache/dev-haskell/hs-bibutils-4.12
index 2f4ff10a7941..6a92a32168c2 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-4.12
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-4.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hs-bibutils/4.12/hs-bibutils-4.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=36aa868433db5cdce699c88235ffeede
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1 b/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1
index a7492634267b..f3bd003e03b6 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.15
 SRC_URI=mirror://hackage/packages/archive/hs-bibutils/4.15/hs-bibutils-4.15.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=62ea956825e55c6dd0f43e7c2fb09f2c
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-4.17 b/metadata/md5-cache/dev-haskell/hs-bibutils-4.17
index ff9161afee86..f2bc19d5efb3 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-4.17
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.17
 SRC_URI=mirror://hackage/packages/archive/hs-bibutils/4.17/hs-bibutils-4.17.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cf271b4c75f77b90f786147556980111
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-5.0 b/metadata/md5-cache/dev-haskell/hs-bibutils-5.0
index 6c20f136333d..a047da1d895e 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-5.0
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/5.0
 SRC_URI=mirror://hackage/packages/archive/hs-bibutils/5.0/hs-bibutils-5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6eb7444e53dc16479817b09560d15778
diff --git a/metadata/md5-cache/dev-haskell/hs3-0.5.6 b/metadata/md5-cache/dev-haskell/hs3-0.5.6
index 1d7bf9cd8677..ef51a715e50c 100644
--- a/metadata/md5-cache/dev-haskell/hs3-0.5.6
+++ b/metadata/md5-cache/dev-haskell/hs3-0.5.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.6
 SRC_URI=mirror://hackage/packages/archive/hS3/0.5.6/hS3-0.5.6.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=afb6b63b161a0bc5d50d6953386b979e
diff --git a/metadata/md5-cache/dev-haskell/hs3-0.5.7 b/metadata/md5-cache/dev-haskell/hs3-0.5.7
index af6d7b4c722a..a15ee6ddfd95 100644
--- a/metadata/md5-cache/dev-haskell/hs3-0.5.7
+++ b/metadata/md5-cache/dev-haskell/hs3-0.5.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/network:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.7
 SRC_URI=mirror://hackage/packages/archive/hS3/0.5.7/hS3-0.5.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b0c8dd80ea97fe874f3b0cbbf9ba7848
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.17 b/metadata/md5-cache/dev-haskell/hscolour-1.17
index d1f9bb78b6d6..62bd96f8f43e 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.17
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.6.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.17/hscolour-1.17.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b75c86c4c36bbd39fe485eee54b4a3ba
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.19 b/metadata/md5-cache/dev-haskell/hscolour-1.19
index db4931793a26..e0241e507eb3 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.19
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.6.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.19/hscolour-1.19.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3ac277905ca92bf6504fcedddadbc1ac
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.1.5 b/metadata/md5-cache/dev-haskell/hslogger-1.1.5
index f3f90f37eef9..02d3b09b2282 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.1.5
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl <dev-haskell/network-2.4 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hslogger/1.1.5/hslogger-1.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2b5f858075e5c0bdb0dd1d5116006cd1
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.2.1 b/metadata/md5-cache/dev-haskell/hslogger-1.2.1
index 9a2e72f61c3e..0c8b65139d9e 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.2.1
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/hslogger/1.2.1/hslogger-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3aba4c497a53ff2298794d91bb75bb72
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.2.1-r2 b/metadata/md5-cache/dev-haskell/hslogger-1.2.1-r2
index e760a8cebd36..4ccdf7a874d4 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.2.1-r2
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/hslogger/1.2.1/hslogger-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7931aa7dfac7173b65bed7bf4c1a7ed1
diff --git a/metadata/md5-cache/dev-haskell/hslua-0.3.6.1 b/metadata/md5-cache/dev-haskell/hslua-0.3.6.1
index 4a5497a256b6..21655440c920 100644
--- a/metadata/md5-cache/dev-haskell/hslua-0.3.6.1
+++ b/metadata/md5-cache/dev-haskell/hslua-0.3.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.6.1
 SRC_URI=mirror://hackage/packages/archive/hslua/0.3.6.1/hslua-0.3.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e85ce85406d550bcae35b7f46a707c9
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.10.3.5 b/metadata/md5-cache/dev-haskell/hsopenssl-0.10.3.5
index de4346c91ec7..a4dbfdf23d82 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.10.3.5
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.10.3.5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl
 SLOT=0/0.10.3.5
 SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.10.3.5/HsOpenSSL-0.10.3.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=16cb339c028bbb44e43bd9be8cb21724
diff --git a/metadata/md5-cache/dev-haskell/hspec-1.5.4 b/metadata/md5-cache/dev-haskell/hspec-1.5.4
index 819f1c66eaf9..73e525c59a5f 100644
--- a/metadata/md5-cache/dev-haskell/hspec-1.5.4
+++ b/metadata/md5-cache/dev-haskell/hspec-1.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/deepseq:=[profile?] =dev-haskell/hspec-expectations-0.3.2*:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] =dev-haskell/random-1.0*:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.5.4
 SRC_URI=mirror://hackage/packages/archive/hspec/1.5.4/hspec-1.5.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6f09c9ce8935d42c0c4f97424400bb06
diff --git a/metadata/md5-cache/dev-haskell/hspec-1.7.2.1 b/metadata/md5-cache/dev-haskell/hspec-1.7.2.1
index 7ccf73893a4f..4b0c3b218ff2 100644
--- a/metadata/md5-cache/dev-haskell/hspec-1.7.2.1
+++ b/metadata/md5-cache/dev-haskell/hspec-1.7.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.7.2.1
 SRC_URI=mirror://hackage/packages/archive/hspec/1.7.2.1/hspec-1.7.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8290b68ba2c68a3aa92228e79b2b51c5
diff --git a/metadata/md5-cache/dev-haskell/hspec-1.8.1.1 b/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
index 5ed1e312997e..35cb84aae759 100644
--- a/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
+++ b/metadata/md5-cache/dev-haskell/hspec-1.8.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] >=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.8.1.1
 SRC_URI=mirror://hackage/packages/archive/hspec/1.8.1.1/hspec-1.8.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d5a06208e5759e202b6cf80908aaa7c6
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.2 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.2
index b2b7477146a5..b47bb2816fd5 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.2
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2
 SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.3.2/hspec-expectations-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39e02c27a15229104b5ecec6e4df97b4
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.3 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.3
index 20236a636ddd..b6f3ddc38a4b 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.3
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.3.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.3.3/hspec-expectations-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ddd60e44ce8270e61e078940a4da1ed4
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.5.0.1 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.5.0.1
index da8a0249cda8..47e9a5e8a973 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.5.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.0.1
 SRC_URI=mirror://hackage/packages/archive/hspec-expectations/0.5.0.1/hspec-expectations-0.5.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=53060c270751c0efe51005ff04e6d8b9
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-1.5.4 b/metadata/md5-cache/dev-haskell/hspec-meta-1.5.4
index 6512f9633098..8d8cbc0e71bc 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-1.5.4
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-1.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/deepseq:=[profile?] =dev-haskell/hspec-expectations-0.3.2*:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] =dev-haskell/random-1.0*:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.5.4
 SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.5.4/hspec-meta-1.5.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f90b34d094be15895e7195a62898e80e
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-1.7.2 b/metadata/md5-cache/dev-haskell/hspec-meta-1.7.2
index ebb3c39ade48..0f56bec0d3f2 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-1.7.2
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-1.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.7.2
 SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.7.2/hspec-meta-1.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=475c5dcecec4329d82a8e959d90f5816
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-1.8.1 b/metadata/md5-cache/dev-haskell/hspec-meta-1.8.1
index 1a3a7d4bbf18..76581e494dc0 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-1.8.1
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-1.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/hspec-expectations:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] dev-haskell/quickcheck-io:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.8.1
 SRC_URI=mirror://hackage/packages/archive/hspec-meta/1.8.1/hspec-meta-1.8.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=27bd04e6d39a262120887c798b89db6d
diff --git a/metadata/md5-cache/dev-haskell/hsql-1.8.1 b/metadata/md5-cache/dev-haskell/hsql-1.8.1
index a2116c4bae30..e1515f3f2cd6 100644
--- a/metadata/md5-cache/dev-haskell/hsql-1.8.1
+++ b/metadata/md5-cache/dev-haskell/hsql-1.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql/1.8.1/hsql-1.8.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e42188e66d5af3e9845434cd4df5ef8
diff --git a/metadata/md5-cache/dev-haskell/hsql-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-1.8.2
index d50d03d31c78..84dfd8257591 100644
--- a/metadata/md5-cache/dev-haskell/hsql-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-1.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql/1.8.2/hsql-1.8.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=79276f542454b2666cd6ca17f02f08c9
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.1 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.1
index 718bce2cf615..187a62413b10 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.1
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-mysql/1.8.1/hsql-mysql-1.8.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=71b3df8e6e0b0791f47159ce85a7a275
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2
index 94bbf83f0bf5..004bece7351f 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=virtual/mysql-4.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-mysql/1.8.2/hsql-mysql-1.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2ba478bfb9231093249eee0c4386046
diff --git a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.1.1 b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.1.1
index 625c29276017..fce91a0b4947 100644
--- a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.1.1
+++ b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-odbc/1.8.1.1/hsql-odbc-1.8.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=106ce52e0f5de614e32fc404983c4ff8
diff --git a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
index 09a27de965d1..5945b8764f8d 100644
--- a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/unixODBC-2.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-odbc/1.8.2/hsql-odbc-1.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=501ed0c7caca82ffa642517b91f42b46
diff --git a/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.1 b/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.1
index be1682a14740..57a7f617ad78 100644
--- a/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.1
+++ b/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/hsql-1.8*[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/postgresql-base-7
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-postgresql/1.8.1/hsql-postgresql-1.8.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e3180dc7140b6ab3c8437f8c020fddf8
diff --git a/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.2
index fa46764eb412..6a0f415fafa2 100644
--- a/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-postgresql-1.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8.2[profile?] <dev-haskell/hsql-1.9[profile?] >=dev-lang/ghc-6.10.1 >=dev-db/postgresql-base-7
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hsql-postgresql/1.8.2/hsql-postgresql-1.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2a3a5f9ab4c06248873468922fc7cb59
diff --git a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
index 6decd87cdecd..8c51f30a9b30 100644
--- a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.8.2
 SRC_URI=mirror://hackage/packages/archive/hsql-sqlite3/1.8.2/hsql-sqlite3-1.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=616bb6db5d542034c5eb9cb84ed6523c
diff --git a/metadata/md5-cache/dev-haskell/hstringtemplate-0.7.1 b/metadata/md5-cache/dev-haskell/hstringtemplate-0.7.1
index 2a15152dc2a7..be06c74d5f0b 100644
--- a/metadata/md5-cache/dev-haskell/hstringtemplate-0.7.1
+++ b/metadata/md5-cache/dev-haskell/hstringtemplate-0.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/deepseq:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= quasi-quotation? ( dev-haskell/mtl:=[profile?] ) syb-with-class? ( dev-haskell/syb-with-class:=[profile?] )
 SLOT=0/0.7.1
 SRC_URI=mirror://hackage/packages/archive/HStringTemplate/0.7.1/HStringTemplate-0.7.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b8078ce7778349a98da628833396934d
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2 b/metadata/md5-cache/dev-haskell/html-1.0.1.2
index 1560fc4c8976..beea0583ad0e 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/html/1.0.1.2/html-1.0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1e0f230688cc121c6746e97d0b920fc4
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1 b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
index e28ce609a334..ba3b831cdbfa 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.1.2
 SRC_URI=mirror://hackage/packages/archive/html/1.0.1.2/html-1.0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e5478881a6fc4a7f34e4e1c23356cc82
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/html-conduit-1.1.0
index 1484523ff501..6df2da3e84d7 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/filesystem-conduit-1.0:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] >=dev-haskell/tagstream-conduit-0.4:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] =dev-haskell/xml-conduit-1.1*:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0
 SRC_URI=mirror://hackage/packages/archive/html-conduit/1.1.0/html-conduit-1.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=701d5e220d3da4d5fb141880407cf7aa
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.1.0.1 b/metadata/md5-cache/dev-haskell/html-conduit-1.1.0.1
index 146a89d21fa1..ad7c4ba4224e 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.1.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile
 RESTRICT=test
 SLOT=0/1.1.0.1
 SRC_URI=mirror://hackage/packages/archive/html-conduit/1.1.0.1/html-conduit-1.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4cb6909aba626324a6b309a3297ee33a
diff --git a/metadata/md5-cache/dev-haskell/http-4000.1.1 b/metadata/md5-cache/dev-haskell/http-4000.1.1
index 8768058e01d0..6d7481a221e9 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.1.1
+++ b/metadata/md5-cache/dev-haskell/http-4000.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl dev-haskell/network dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.1.1/HTTP-4000.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5bab1c431fe37e3cc237fe2a9faa838f
diff --git a/metadata/md5-cache/dev-haskell/http-4000.1.2 b/metadata/md5-cache/dev-haskell/http-4000.1.2
index 30a866e11ef4..094dd354a06e 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.1.2
+++ b/metadata/md5-cache/dev-haskell/http-4000.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.1.2/HTTP-4000.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e1436663ed93f8454bdec8e472d79568
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.2 b/metadata/md5-cache/dev-haskell/http-4000.2.2
index c5346bd6fedb..6f83ea8bf87f 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.2
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/mtl-2.0*[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.2/HTTP-4000.2.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=65aa32dfb01da1e283d867cb28769a86
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.3 b/metadata/md5-cache/dev-haskell/http-4000.2.3
index 3ce7ad50cbc9..76282a6908f6 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.3
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0[profile?] <dev-haskell/mtl-2.2[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.3/HTTP-4000.2.3.tar.gz http://dev.gentoo.org/~gienah/2big4tree/dev-haskell/http/HTTP-4000.2.3-test-suite.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39c5bedb2e3b7ab37bf7e34e52ae8117
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.6 b/metadata/md5-cache/dev-haskell/http-4000.2.6
index 377e3186e1f1..c524d911a5e6 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.6
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-
 RESTRICT=test
 SLOT=0/4000.2.6
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.6/HTTP-4000.2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=42c952efcfa83446fce382e2f74ada03
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.8 b/metadata/md5-cache/dev-haskell/http-4000.2.8
index a918fbd153a3..942d2176a759 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.8
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.8
@@ -10,5 +10,5 @@ RDEPEND=<dev-haskell/network-2.5:=[profile?] dev-haskell/parsec:=[profile?] >=de
 RESTRICT=test
 SLOT=0/4000.2.8
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.8/HTTP-4000.2.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab7f7edc40f9dee29eff22bb516f2f70
diff --git a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.0 b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.0
index 2c6de71571ba..e32dba62297c 100644
--- a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.0
+++ b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.0
 SRC_URI=mirror://hackage/packages/archive/http-attoparsec/0.1.0/http-attoparsec-0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6b73cb051e208927ea3d1593463ff34e
diff --git a/metadata/md5-cache/dev-haskell/http-client-0.2.0.3 b/metadata/md5-cache/dev-haskell/http-client-0.2.0.3
index 6762f23301d4..985e65e1e99c 100644
--- a/metadata/md5-cache/dev-haskell/http-client-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/http-client-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/publicsuffixlist:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.3
 SRC_URI=mirror://hackage/packages/archive/http-client/0.2.0.3/http-client-0.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=420ab27b6915498d2569fdbc9c19ebf3
diff --git a/metadata/md5-cache/dev-haskell/http-client-conduit-0.2.0.0 b/metadata/md5-cache/dev-haskell/http-client-conduit-0.2.0.0
index 7c449a2e2701..ed7a0b1df495 100644
--- a/metadata/md5-cache/dev-haskell/http-client-conduit-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/http-client-conduit-0.2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/conduit:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.0
 SRC_URI=mirror://hackage/packages/archive/http-client-conduit/0.2.0.0/http-client-conduit-0.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=11167df31c3e728d65ae233a2a1b6640
diff --git a/metadata/md5-cache/dev-haskell/http-client-multipart-0.2.0.0 b/metadata/md5-cache/dev-haskell/http-client-multipart-0.2.0.0
index b7f19e60b13a..4e48434b53d3 100644
--- a/metadata/md5-cache/dev-haskell/http-client-multipart-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/http-client-multipart-0.2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.0
 SRC_URI=mirror://hackage/packages/archive/http-client-multipart/0.2.0.0/http-client-multipart-0.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2cb1727e1f6f5238bfdb13f5ae280c69
diff --git a/metadata/md5-cache/dev-haskell/http-client-tls-0.2.0.0 b/metadata/md5-cache/dev-haskell/http-client-tls-0.2.0.0
index 6cc74ab8cf91..f353507eb488 100644
--- a/metadata/md5-cache/dev-haskell/http-client-tls-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/http-client-tls-0.2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/connection-0.1.3:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/tls-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.0
 SRC_URI=mirror://hackage/packages/archive/http-client-tls/0.2.0.0/http-client-tls-0.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f1074ac892d53ccc1033df420763c0f8
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.2 b/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.2
index f5a969ad9c01..d81e44a50801 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.2
+++ b/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-data-0.5.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/certificate-1.3:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] >=dev-haskell/cprng-aes-0.3:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/failure-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/publicsuffixlist-0.0.3:=[profile?] <dev-haskell/publicsuffixlist-1.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/socks-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] >=dev-haskell/tls-extra-0.5.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:= <dev-haskell/network-2.2.3:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] =dev-haskell/network-bytestring-0.1.3*:=[profile?]
 SLOT=0/1.9.4.2
 SRC_URI=mirror://hackage/packages/archive/http-conduit/1.9.4.2/http-conduit-1.9.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1bef6d4364c093d14a47f5872f947ef6
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.3 b/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.3
index cb9de185b9e1..75cdf0c474e4 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.3
+++ b/metadata/md5-cache/dev-haskell/http-conduit-1.9.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-data-0.5.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/certificate-1.3:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] >=dev-haskell/cprng-aes-0.3:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/failure-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/publicsuffixlist-0.0.3:=[profile?] <dev-haskell/publicsuffixlist-1.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/socks-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] >=dev-haskell/tls-extra-0.5.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-haskell/network-2.3:=[profile?]
 SLOT=0/1.9.4.3
 SRC_URI=mirror://hackage/packages/archive/http-conduit/1.9.4.3/http-conduit-1.9.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=82368603f305372045ff7bb64ad64045
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-1.9.5 b/metadata/md5-cache/dev-haskell/http-conduit-1.9.5
index f37c71c7d0b0..36386dead050 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-1.9.5
+++ b/metadata/md5-cache/dev-haskell/http-conduit-1.9.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-data-0.5.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/certificate-1.3:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/failure-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/publicsuffixlist-0.0.3:=[profile?] <dev-haskell/publicsuffixlist-1.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/socks-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-extra-0.5.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/tls-1.1.3:=[profile?]
 SLOT=0/1.9.5
 SRC_URI=mirror://hackage/packages/archive/http-conduit/1.9.5/http-conduit-1.9.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=937c1c50ea886177ccadf5b6f34bc26b
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-1.9.5.1 b/metadata/md5-cache/dev-haskell/http-conduit-1.9.5.1
index 7d95ee511c39..4e5f1362ff88 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-1.9.5.1
+++ b/metadata/md5-cache/dev-haskell/http-conduit-1.9.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-data-0.5.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/certificate-1.3:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/deepseq:=[profile?] >=dev-haskell/failure-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/publicsuffixlist-0.0.3:=[profile?] <dev-haskell/publicsuffixlist-1.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/socks-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-extra-0.5.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/tls-1.1.3:=[profile?]
 SLOT=0/1.9.5.1
 SRC_URI=mirror://hackage/packages/archive/http-conduit/1.9.5.1/http-conduit-1.9.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9e20456ff4bc35e096861b25e59897bb
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-2.0.0.2 b/metadata/md5-cache/dev-haskell/http-conduit-2.0.0.2
index 96791201d74c..46d6f4ca387d 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-2.0.0.2
+++ b/metadata/md5-cache/dev-haskell/http-conduit-2.0.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-client-0.2:=[profile?] dev-haskell/http-client-conduit:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.0.2
 SRC_URI=mirror://hackage/packages/archive/http-conduit/2.0.0.2/http-conduit-2.0.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=80b11e32aed3a6fdbcfe07c3e12939f2
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.4 b/metadata/md5-cache/dev-haskell/http-date-0.0.4
index c000ad9ba8be..6704135221b9 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.4
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.4
 SRC_URI=mirror://hackage/packages/archive/http-date/0.0.4/http-date-0.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8a82acf1fed9aebc6c072603f0a27970
diff --git a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.1.1.6 b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.1.1.6
index fa2b5e37d78e..c999fc732820 100644
--- a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.1.1.6
+++ b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.1.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.6
 SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.1.1.6/http-reverse-proxy-0.1.1.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=050b551b41c822902a250e64e7a19be6
diff --git a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.2.0 b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.2.0
index 4717db7a2564..aee0ff87adb4 100644
--- a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.2.0
+++ b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/classy-prelude-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-conduit-1.6:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3.4:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/http-reverse-proxy/0.2.0/http-reverse-proxy-0.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1af5f00ffbc0406004abd9dd616b9a40
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.8.0 b/metadata/md5-cache/dev-haskell/http-types-0.8.0
index 430a15aa97b4..f606f670d23e 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.8.0
+++ b/metadata/md5-cache/dev-haskell/http-types-0.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.1:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8.0
 SRC_URI=mirror://hackage/packages/archive/http-types/0.8.0/http-types-0.8.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b951dc9e59b331b6ada1a65cf3aa4d54
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.8.1 b/metadata/md5-cache/dev-haskell/http-types-0.8.1
index 85874d1ca51f..f11feb0d756e 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.8.1
+++ b/metadata/md5-cache/dev-haskell/http-types-0.8.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8.1
 SRC_URI=mirror://hackage/packages/archive/http-types/0.8.1/http-types-0.8.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=beaf0896ac1de51fd112c65dd903b03d
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.8.2 b/metadata/md5-cache/dev-haskell/http-types-0.8.2
index 5cdb7f4baffb..51469a300956 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.8.2
+++ b/metadata/md5-cache/dev-haskell/http-types-0.8.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8.2
 SRC_URI=mirror://hackage/packages/archive/http-types/0.8.2/http-types-0.8.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=db6d9cf5f08b732386903678f353ba10
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.8.3 b/metadata/md5-cache/dev-haskell/http-types-0.8.3
index ad61d1f66bb4..3bd4fd89b15a 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.8.3
+++ b/metadata/md5-cache/dev-haskell/http-types-0.8.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8.3
 SRC_URI=mirror://hackage/packages/archive/http-types/0.8.3/http-types-0.8.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=48076163decd2f0bbd58b546cac11656
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4
index 7cc93d4ebf9f..c7fda441201f 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/network[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/httpd-shed/0.4/httpd-shed-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=85620e4ef28f1710af47fecba8a46bdb
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
index 731732b3f2f7..475ae8430133 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/httpd-shed/0.4/httpd-shed-0.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0e8dfca95dc5ed5767e85c05eb80d301
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.4.2 b/metadata/md5-cache/dev-haskell/hunit-1.2.4.2
index 06581dedb932..c00ff74bf2ec 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.4.2
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.4.2/HUnit-1.2.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5a2b8cdb2f8fdbabcfb367f84e6e5a54
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.1 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.1
index 4e7396da7d5a..0e488606436e 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.1
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.5.1/HUnit-1.2.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dc3ab1efb61ef49f29aab1df3841d03f
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
index a846790b1b7e..885955107273 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.5.2/HUnit-1.2.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2464d85cf11439341030774a47057af9
diff --git a/metadata/md5-cache/dev-haskell/hxt-9.3.1.1 b/metadata/md5-cache/dev-haskell/hxt-9.3.1.1
index 6c18a81fc4ba..3f77ee980e61 100644
--- a/metadata/md5-cache/dev-haskell/hxt-9.3.1.1
+++ b/metadata/md5-cache/dev-haskell/hxt-9.3.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?] >=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-2:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/hxt-charproperties-9.1:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] =dev-haskell/hxt-regex-xmlschema-9*:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] <dev-haskell/hxt-unicode-10:=[profile?] =dev-haskell/mtl-2*:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/9.3.1.1
 SRC_URI=mirror://hackage/packages/archive/hxt/9.3.1.1/hxt-9.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dbea751afb3f1a684eab04809fb54827
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.0 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.0
index 540cbd5046de..7d9442cb97e2 100644
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.0
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-charproperties/9.1.0/hxt-charproperties-9.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=12d98c1f0dc09f987895d6c0d1404c00
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1
index b8968116ae12..36e12296c5f9 100644
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-charproperties/9.1.1/hxt-charproperties-9.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eeeab9fb3673e7deb1f72a356764f4f9
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1.1 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1.1
index 7e5fac98a408..a33bd3cd9756 100644
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1.1
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/9.1.1.1
 SRC_URI=mirror://hackage/packages/archive/hxt-charproperties/9.1.1.1/hxt-charproperties-9.1.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a44a3bc703bd422e3c0dd8d14f64047
diff --git a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.1 b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.1
index d4f1ac26c957..c5d108206ba9 100644
--- a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.1
+++ b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9* >=dev-haskell/parsec-2.1 <dev-haskell/parsec-4 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.0.1/hxt-regex-xmlschema-9.0.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7d47015eb9dccaa7c90530739459013f
diff --git a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.4 b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.4
index 4a4b7212a95d..3e235a5a46e5 100644
--- a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.4
+++ b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9*[profile?] >=dev-haskell/parsec-2.1[profile?] <dev-haskell/parsec-4[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.0.4/hxt-regex-xmlschema-9.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb3b04cb8351799734234f2997d648b8
diff --git a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.1.0 b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.1.0
index 1d54f2204ffc..db3ab429a83b 100644
--- a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.1.0
+++ b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/9.1.0
 SRC_URI=mirror://hackage/packages/archive/hxt-regex-xmlschema/9.1.0/hxt-regex-xmlschema-9.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e674dd9e2a28418f2330847acf18de71
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.1 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.1
index a3dd2b195f55..95ca3bb42c98 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.1
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9* >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-unicode/9.0.1/hxt-unicode-9.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e946b8b2a1071a8cb1970f2086a4735f
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2
index 99f50759615e..ff7193eb6dfe 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9*[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hxt-unicode/9.0.2/hxt-unicode-9.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a2278c8cd57153000b4abef109e2ecd0
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.1 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.1
index ca9be108d0aa..837a32d638ae 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.1
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/hxt-charproperties-9*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/9.0.2.1
 SRC_URI=mirror://hackage/packages/archive/hxt-unicode/9.0.2.1/hxt-unicode-9.0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0d0b7ab0838c813e03e8e8ee85c326e4
diff --git a/metadata/md5-cache/dev-haskell/iconv-0.4.1.1 b/metadata/md5-cache/dev-haskell/iconv-0.4.1.1
index e2a0007b2a51..a4d2132f24aa 100644
--- a/metadata/md5-cache/dev-haskell/iconv-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/iconv-0.4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1.1
 SRC_URI=mirror://hackage/packages/archive/iconv/0.4.1.1/iconv-0.4.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dcbb8e76c208fe06a723139a07448fd7
diff --git a/metadata/md5-cache/dev-haskell/iconv-0.4.1.2 b/metadata/md5-cache/dev-haskell/iconv-0.4.1.2
index 681d41c7819a..c56fb23c7114 100644
--- a/metadata/md5-cache/dev-haskell/iconv-0.4.1.2
+++ b/metadata/md5-cache/dev-haskell/iconv-0.4.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1.2
 SRC_URI=mirror://hackage/packages/archive/iconv/0.4.1.2/iconv-0.4.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ac6f795eace1640b379c38e53d5b1262
diff --git a/metadata/md5-cache/dev-haskell/idna-0.2 b/metadata/md5-cache/dev-haskell/idna-0.2
index a79977e3af78..d0e02b8b2e20 100644
--- a/metadata/md5-cache/dev-haskell/idna-0.2
+++ b/metadata/md5-cache/dev-haskell/idna-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-0.1.2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/idna/0.2/idna-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=211fa21045b6ea624a4babc3f00b6b75
diff --git a/metadata/md5-cache/dev-haskell/ieee754-0.7.3-r1 b/metadata/md5-cache/dev-haskell/ieee754-0.7.3-r1
index fa2047b484e8..12f20f959f47 100644
--- a/metadata/md5-cache/dev-haskell/ieee754-0.7.3-r1
+++ b/metadata/md5-cache/dev-haskell/ieee754-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= virtual/libc
 SLOT=0/0.7.3
 SRC_URI=mirror://hackage/packages/archive/ieee754/0.7.3/ieee754-0.7.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4610207c6954e0700bf27e7906ae2a5b
diff --git a/metadata/md5-cache/dev-haskell/ifelse-0.85 b/metadata/md5-cache/dev-haskell/ifelse-0.85
index 0f2913ad0b8c..9515573ab115 100644
--- a/metadata/md5-cache/dev-haskell/ifelse-0.85
+++ b/metadata/md5-cache/dev-haskell/ifelse-0.85
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/IfElse/0.85/IfElse-0.85.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f266b7236642a4bb4ae7e7ae8f38db80
diff --git a/metadata/md5-cache/dev-haskell/iproute-1.2.11 b/metadata/md5-cache/dev-haskell/iproute-1.2.11
index eca9bf4f040c..cf0890152306 100644
--- a/metadata/md5-cache/dev-haskell/iproute-1.2.11
+++ b/metadata/md5-cache/dev-haskell/iproute-1.2.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.11
 SRC_URI=mirror://hackage/packages/archive/iproute/1.2.11/iproute-1.2.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a1b7b76dcb088d443e9d942e73303c3b
diff --git a/metadata/md5-cache/dev-haskell/json-0.4.3 b/metadata/md5-cache/dev-haskell/json-0.4.3
index 8701067071d9..1773b4cce28e 100644
--- a/metadata/md5-cache/dev-haskell/json-0.4.3
+++ b/metadata/md5-cache/dev-haskell/json-0.4.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/cabal-1.2.0 dev-haskell/mtl dev-haskell/parsec
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/json/0.4.3/json-0.4.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ffec046ce4506370130af0e1b43b0b20
diff --git a/metadata/md5-cache/dev-haskell/json-0.4.4 b/metadata/md5-cache/dev-haskell/json-0.4.4
index 3f99dbc12748..1528e9798ec7 100644
--- a/metadata/md5-cache/dev-haskell/json-0.4.4
+++ b/metadata/md5-cache/dev-haskell/json-0.4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl >=dev-lang/ghc-6.10.4 generic? ( dev-haskell/syb ) parsec? ( dev-haskell/parsec )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/json/0.4.4/json-0.4.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=17ab12ca692c1e580f90de26b384b818
diff --git a/metadata/md5-cache/dev-haskell/json-0.5 b/metadata/md5-cache/dev-haskell/json-0.5
index 4f4c1404b58d..3d3353d4fc67 100644
--- a/metadata/md5-cache/dev-haskell/json-0.5
+++ b/metadata/md5-cache/dev-haskell/json-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl >=dev-lang/ghc-6.10.4 generic? ( >=dev-haskell/syb-0.3.3 ) parsec? ( dev-haskell/parsec )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/json/0.5/json-0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f7183284dcb882621f3d921e25db1044
diff --git a/metadata/md5-cache/dev-haskell/json-0.7 b/metadata/md5-cache/dev-haskell/json-0.7
index d899cd3f7854..027ff0278a5f 100644
--- a/metadata/md5-cache/dev-haskell/json-0.7
+++ b/metadata/md5-cache/dev-haskell/json-0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] parsec? ( dev-haskell/parsec:=[profile?] ) generic? ( >=dev-haskell/syb-0.3.3:=[profile?] ) >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7
 SRC_URI=mirror://hackage/packages/archive/json/0.7/json-0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6bfdee3fc1639f4762a55176b61b693c
diff --git a/metadata/md5-cache/dev-haskell/keys-3.10 b/metadata/md5-cache/dev-haskell/keys-3.10
index 2c2c9d2fc066..fc5ea8b6372e 100644
--- a/metadata/md5-cache/dev-haskell/keys-3.10
+++ b/metadata/md5-cache/dev-haskell/keys-3.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.10
 SRC_URI=mirror://hackage/packages/archive/keys/3.10/keys-3.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39dab2d57ca04d26e86a50cd02312431
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.3.2.1 b/metadata/md5-cache/dev-haskell/language-c-0.3.2.1
index c3284fbc289c..912f924aea1f 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.3.2.1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.3.2.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/language-c/0.3.2.1/language-c-0.3.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a652a379dce8095f30574bbe0fb222f5
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.3.2.1-r1 b/metadata/md5-cache/dev-haskell/language-c-0.3.2.1-r1
index 5fe54ef95e01..479b3947c5ec 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.3.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/language-c/0.3.2.1/language-c-0.3.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a57c22d1ff30f506226ab60a80a2d42
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.4.2 b/metadata/md5-cache/dev-haskell/language-c-0.4.2
index dadffd4f67bf..a6b69d11bb17 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.4.2
+++ b/metadata/md5-cache/dev-haskell/language-c-0.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/language-c/0.4.2/language-c-0.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=83c1e0368590c8a2efa3673913883376
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4
index 08ca72c286c4..9249a5e34df3 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=mirror://hackage/packages/archive/language-haskell-extract/0.2.4/language-haskell-extract-0.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b7c01f5df648bc28ef7d3f1d86153319
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.5.7 b/metadata/md5-cache/dev-haskell/language-javascript-0.5.7
index 3818950272d1..5a607bc2ac9c 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.5.7
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.5.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-1:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.9:=[profile?] >=dev-haskell/utf8-light-0.4:=[profile?] <dev-haskell/utf8-light-1.0:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.5.7
 SRC_URI=mirror://hackage/packages/archive/language-javascript/0.5.7/language-javascript-0.5.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=509ac7924ae003636498fde8cdbc1124
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.5.8 b/metadata/md5-cache/dev-haskell/language-javascript-0.5.8
index e9e5fafefbd2..9dc5d2fd332f 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.5.8
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.5.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-1:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.9:=[profile?] >=dev-haskell/utf8-light-0.4:=[profile?] <dev-haskell/utf8-light-1.0:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.5.8
 SRC_URI=mirror://hackage/packages/archive/language-javascript/0.5.8/language-javascript-0.5.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6adf7df1c93116efc51a3c7ced6ac4d9
diff --git a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6 b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6
index af4a31aa25a1..b4dc723774f6 100644
--- a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6
+++ b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lazysmallcheck/0.6/lazysmallcheck-0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=649f3184429ad3df9617080d6f26185e
diff --git a/metadata/md5-cache/dev-haskell/lens-3.10 b/metadata/md5-cache/dev-haskell/lens-3.10
index 6598a6522b91..f3b08f999544 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.10
+++ b/metadata/md5-cache/dev-haskell/lens-3.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.10
 SRC_URI=mirror://hackage/packages/archive/lens/3.10/lens-3.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3c06fb8f9626893c8138ce152dadc0e2
diff --git a/metadata/md5-cache/dev-haskell/lens-3.10.0.1 b/metadata/md5-cache/dev-haskell/lens-3.10.0.1
index a3610aa5bf60..a02124d4d1b0 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.10.0.1
+++ b/metadata/md5-cache/dev-haskell/lens-3.10.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.10.0.1
 SRC_URI=mirror://hackage/packages/archive/lens/3.10.0.1/lens-3.10.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=202e2398bb6efc820dc4b2718cb92862
diff --git a/metadata/md5-cache/dev-haskell/lens-3.9.0.2-r1 b/metadata/md5-cache/dev-haskell/lens-3.9.0.2-r1
index b7f54c57fe42..6dd903613c7a 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.9.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/lens-3.9.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/bifunctors-3*:=[profile?] =dev-haskell/comonad-3*:=[profile?] =dev-haskell/comonad-transformers-3*:=[profile?] =dev-haskell/comonads-fd-3*:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] =dev-haskell/monadcatchio-transformers-0.3*:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] =dev-haskell/split-0.2*:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] =dev-haskell/unordered-containers-0.2*:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.9.0.2
 SRC_URI=mirror://hackage/packages/archive/lens/3.9.0.2/lens-3.9.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2fe61e162dcee254912f5d38b4b417b6
diff --git a/metadata/md5-cache/dev-haskell/lens-3.9.1 b/metadata/md5-cache/dev-haskell/lens-3.9.1
index 4bda690df68b..67fed49e5e9d 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.9.1
+++ b/metadata/md5-cache/dev-haskell/lens-3.9.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?] >=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?] >=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.9.1
 SRC_URI=mirror://hackage/packages/archive/lens/3.9.1/lens-3.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a514ae4288f15e50597609146e2740b1
diff --git a/metadata/md5-cache/dev-haskell/lens-3.9.2 b/metadata/md5-cache/dev-haskell/lens-3.9.2
index a37ac1706ab7..9ddc4c68ab7a 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.9.2
+++ b/metadata/md5-cache/dev-haskell/lens-3.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?] >=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?] >=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/3.9.2
 SRC_URI=mirror://hackage/packages/archive/lens/3.9.2/lens-3.9.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=734ec316ff60efa2daf75c93fb034faa
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.17 b/metadata/md5-cache/dev-haskell/lhs2tex-1.17
index 5a2db179fcfd..622cee771066 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.17
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathextra
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.17/lhs2tex-1.17.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d43963282fd25a0d2a60afd3a6558771
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1
index 540b77c16f9b..a667f3140934 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathextra
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lhs2tex/1.18.1/lhs2tex-1.18.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a2d0b4da31d6a81edab310d9b54e0565
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.7.2 b/metadata/md5-cache/dev-haskell/libmpd-0.7.2
index a4982c27b892..7db9d39f6424 100644
--- a/metadata/md5-cache/dev-haskell/libmpd-0.7.2
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/mtl-2.0*[profile?] >=dev-haskell/network-2.1[profile?] <dev-haskell/network-2.4[profile?] >=dev-haskell/utf8-string-0.3.1[profile?] <dev-haskell/utf8-string-0.4[profile?] >=dev-lang/ghc-6.12.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/libmpd/0.7.2/libmpd-0.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=965b713fdeaa0edc7e1160f510e6c7ff
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.8.0.1-r1 b/metadata/md5-cache/dev-haskell/libmpd-0.8.0.1-r1
index 884cce909755..019cef19d0c3 100644
--- a/metadata/md5-cache/dev-haskell/libmpd-0.8.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.8.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/libmpd/0.8.0.1/libmpd-0.8.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=69496f008b73b51726a7925c0eb80472
diff --git a/metadata/md5-cache/dev-haskell/libxml-0.1.1 b/metadata/md5-cache/dev-haskell/libxml-0.1.1
index cffa0b74d3e3..0fb80e1e87a4 100644
--- a/metadata/md5-cache/dev-haskell/libxml-0.1.1
+++ b/metadata/md5-cache/dev-haskell/libxml-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/libxml/0.1.1/libxml-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e17fe51140db07a98911c5b0e47a916c
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.2 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.2
index d143df327501..e18de84d21b9 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.2
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=<dev-haskell/text-0.12 =dev-haskell/xml-types-0.3* >=dev-lang/ghc-6.10.1 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/libxml-sax/0.7.2/libxml-sax-0.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=18755ab4aa5fb77c430467585afc1c58
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.3-r1 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.3-r1
index 00e125857b54..85f8eb9da415 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.3-r1
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.7.3
 SRC_URI=mirror://hackage/packages/archive/libxml-sax/0.7.3/libxml-sax-0.7.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7e2a333c8d96788097748fe141c85df1
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.4 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.4
index dcad4a494e0a..ee16ec650789 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.4
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=Bindings for the libXML2 SAX interface
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/haskell-libxml/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.7.4
 SRC_URI=mirror://hackage/packages/archive/libxml-sax/0.7.4/libxml-sax-0.7.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=29fcedadcd8115dd5aa9a7fef90ac14e
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=3bb142f4c4c64986016195522eb6b1db
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.1.0.3-r1 b/metadata/md5-cache/dev-haskell/lifted-base-0.1.0.3-r1
index ca09994c0573..410099e9c4c4 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1[profile?] <dev-haskell/base-unicode-symbols-0.3[profile?] =dev-haskell/monad-control-0.3*[profile?] =dev-haskell/transformers-base-0.4*[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.1.0.3/lifted-base-0.1.0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5a7236ef2baf2ac3d8e2626766cc61cf
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.1.1 b/metadata/md5-cache/dev-haskell/lifted-base-0.1.1
index 15438475747e..a504a26dacee 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.1.1
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1[profile?] <dev-haskell/base-unicode-symbols-0.3[profile?] =dev-haskell/monad-control-0.3*[profile?] =dev-haskell/transformers-base-0.4*[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.1.1/lifted-base-0.1.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c35bda2c41d69f568c8233d56d32664e
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2 b/metadata/md5-cache/dev-haskell/lifted-base-0.2
index 625a468ad31d..6e77df991e9f 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] =dev-haskell/transformers-base-0.4*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2/lifted-base-0.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ee0ab1562f2c2240f57db79b68970d8e
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.2 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.2
index a913eb2e9ece..f44f3187e474 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.2
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] =dev-haskell/transformers-base-0.4*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.2
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.0.2/lifted-base-0.2.0.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ef392cacbcfb008c2c03dc9e6358bff8
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.3 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.3
index fe0bfb658412..f55654b1ca2d 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] =dev-haskell/transformers-base-0.4*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.3
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.0.3/lifted-base-0.2.0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8e7291498a8abe8edaddbde12d17edec
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.0 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.0
index 59de2b433547..f9e90bfb716a 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] =dev-haskell/transformers-base-0.4*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.0
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.1.0/lifted-base-0.2.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3944b69db177fd562029977e9a8badb1
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.1 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.1
index 091aa60769dd..f1e1f6016041 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.1
 SRC_URI=mirror://hackage/packages/archive/lifted-base/0.2.1.1/lifted-base-0.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c902c0c83e31f445bdfe8013d8f37789
diff --git a/metadata/md5-cache/dev-haskell/list-0.5.1 b/metadata/md5-cache/dev-haskell/list-0.5.1
index 505a9d50be52..6d0925c500aa 100644
--- a/metadata/md5-cache/dev-haskell/list-0.5.1
+++ b/metadata/md5-cache/dev-haskell/list-0.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1
 SRC_URI=mirror://hackage/packages/archive/List/0.5.1/List-0.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=46b39139f79684c4bd42d4ec4af193fd
diff --git a/metadata/md5-cache/dev-haskell/logict-0.6.0.1 b/metadata/md5-cache/dev-haskell/logict-0.6.0.1
index 0f4e01b7088d..f9d8222dfed9 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.6.0.1
+++ b/metadata/md5-cache/dev-haskell/logict-0.6.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.0.1
 SRC_URI=mirror://hackage/packages/archive/logict/0.6.0.1/logict-0.6.0.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=548154d9676faae7ac3317d06cf9224e
diff --git a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5 b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5
index 7a852ff0636a..1f4f46d9b45a 100644
--- a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5
+++ b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/maccatcher/2.1.5/maccatcher-2.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=53940a5abc0b9c4cafe3c22542c7132d
diff --git a/metadata/md5-cache/dev-haskell/markdown-unlit-0.2.0.1 b/metadata/md5-cache/dev-haskell/markdown-unlit-0.2.0.1
index 6fd0688943ea..edf930e9411f 100644
--- a/metadata/md5-cache/dev-haskell/markdown-unlit-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/markdown-unlit-0.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.1
 SRC_URI=mirror://hackage/packages/archive/markdown-unlit/0.2.0.1/markdown-unlit-0.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c6a17afda999c014d3ddbbc6881ff94f
diff --git a/metadata/md5-cache/dev-haskell/math-functions-0.1.3.0 b/metadata/md5-cache/dev-haskell/math-functions-0.1.3.0
index 87210ac15ee4..63947258cdaf 100644
--- a/metadata/md5-cache/dev-haskell/math-functions-0.1.3.0
+++ b/metadata/md5-cache/dev-haskell/math-functions-0.1.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/erf-2:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3.0
 SRC_URI=mirror://hackage/packages/archive/math-functions/0.1.3.0/math-functions-0.1.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=866b723a9861876781f1c2dbdd7b7d1f
diff --git a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.0.3 b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.0.3
index e266bcdb2cbc..8300006c149b 100644
--- a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2 dev-haskell/random
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/mersenne-random-pure64/0.2.0.3/mersenne-random-pure64-0.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cda6ef40ef615cb80109dd8dd525126a
diff --git a/metadata/md5-cache/dev-haskell/mime-mail-0.4.2.1 b/metadata/md5-cache/dev-haskell/mime-mail-0.4.2.1
index ea6efa9ebe01..1cef5273478d 100644
--- a/metadata/md5-cache/dev-haskell/mime-mail-0.4.2.1
+++ b/metadata/md5-cache/dev-haskell/mime-mail-0.4.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.4.2.1
 SRC_URI=mirror://hackage/packages/archive/mime-mail/0.4.2.1/mime-mail-0.4.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3784bc2075b6b622f6b28dde60828731
diff --git a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.3 b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.3
index dd60eee13b45..de816bee56f7 100644
--- a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0.3
 SRC_URI=mirror://hackage/packages/archive/mime-types/0.1.0.3/mime-types-0.1.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1b0f910c77db717f63f7d9346804c690
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.2.0.0 b/metadata/md5-cache/dev-haskell/missingh-1.2.0.0
index e26e1f6473b7..a34e0c19d3e0 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.0
 SRC_URI=mirror://hackage/packages/archive/MissingH/1.2.0.0/MissingH-1.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5816804f78d98d2194a9bd170558f037
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.2.0.2 b/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
index 95fbde735995..cb1439cb7db9 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/missingh-1.2.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hslogger:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.0.2
 SRC_URI=mirror://hackage/packages/archive/MissingH/1.2.0.2/MissingH-1.2.0.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e12e07bcd258945d435554a61d5b1830
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.8 b/metadata/md5-cache/dev-haskell/mmap-0.5.8
index ed6367581960..3100dd79a636 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.8
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.8
 SRC_URI=mirror://hackage/packages/archive/mmap/0.5.8/mmap-0.5.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eb1045709a660a5c1dff594c37790b05
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index 15386d9009f6..90ae13717acd 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=mirror://hackage/packages/archive/mmap/0.5.9/mmap-0.5.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=100076de9dc02061125615cc2b53c719
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.0.0 b/metadata/md5-cache/dev-haskell/mmorph-1.0.0
index 1ee3a0723366..10255e1f82ae 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.0.0
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/mmorph/1.0.0/mmorph-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=762eebd565442a9115337455afa04ab7
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.2.0.3 b/metadata/md5-cache/dev-haskell/monad-control-0.2.0.3
index 5d439b8d3f15..e700fb87fb06 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/base-unicode-symbols-0.3 =dev-haskell/transformers-0.2* >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.2.0.3/monad-control-0.2.0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=68d97efd20ad07409aafd2b0917a6567
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.1 b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.1
index 24af07e03d98..6df2cb230639 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.1
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1[profile?] <dev-haskell/base-unicode-symbols-0.3[profile?] >=dev-haskell/transformers-0.2[profile?] <dev-haskell/transformers-0.4[profile?] >=dev-haskell/transformers-base-0.4.1[profile?] <dev-haskell/transformers-base-0.5[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.1.1/monad-control-0.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4350436493bd1f86324be030bb1a69f1
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.3 b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.3
index 646603a6320a..d98d0dab0314 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.3
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1[profile?] <dev-haskell/base-unicode-symbols-0.3[profile?] >=dev-haskell/transformers-0.2[profile?] <dev-haskell/transformers-0.4[profile?] >=dev-haskell/transformers-base-0.4.1[profile?] <dev-haskell/transformers-base-0.5[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.1.3/monad-control-0.3.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8d2e24f9826588ec3a40f814362d22af
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.4 b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.4
index 582ce3b107b9..fadc994543a0 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.1.4
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.4
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.1.4/monad-control-0.3.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a7fc7f1423873754848a09fd17a036a
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.2 b/metadata/md5-cache/dev-haskell/monad-control-0.3.2
index 694173f62317..5c713d15d4b9 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.2
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.2/monad-control-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=feb3ef51275b0f7ed08db1767b9e32ce
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.2.1 b/metadata/md5-cache/dev-haskell/monad-control-0.3.2.1
index 5e0b9f3e2c5a..2cefc054e00a 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.2.1
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2.1
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.2.1/monad-control-0.3.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4c4776a4cae269063c23f73d5aaa62e3
diff --git a/metadata/md5-cache/dev-haskell/monad-control-0.3.2.2 b/metadata/md5-cache/dev-haskell/monad-control-0.3.2.2
index f0cb85eba9e7..4ed11f86cc7f 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-0.3.2.2
+++ b/metadata/md5-cache/dev-haskell/monad-control-0.3.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.2.2
 SRC_URI=mirror://hackage/packages/archive/monad-control/0.3.2.2/monad-control-0.3.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c903747eba079d8d442c011dc8e7487b
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.1.1 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.1.1
index d5f083324aa4..412062a07ff3 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.1.1
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] <dev-haskell/fast-logger-0.4:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/mtl:=[profile?] =dev-haskell/resourcet-0.4*:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.1
 SRC_URI=mirror://hackage/packages/archive/monad-logger/0.3.1.1/monad-logger-0.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5d3d4c2db63f85247dc620955ef03c89
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.3.1 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.3.1
index f3701d09052d..5b722632372e 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.3.1
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.1:=[profile?] dev-haskell/lifted-base:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3.1
 SRC_URI=mirror://hackage/packages/archive/monad-logger/0.3.3.1/monad-logger-0.3.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=384f72c36bded3db0dc758f74a417843
diff --git a/metadata/md5-cache/dev-haskell/monad-loops-0.4.2 b/metadata/md5-cache/dev-haskell/monad-loops-0.4.2
index c4467f401dc1..cd9335729786 100644
--- a/metadata/md5-cache/dev-haskell/monad-loops-0.4.2
+++ b/metadata/md5-cache/dev-haskell/monad-loops-0.4.2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.2
 SRC_URI=mirror://hackage/packages/archive/monad-loops/0.4.2/monad-loops-0.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b18764cb3197e567b08629c8c017e4cb
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.4.3 b/metadata/md5-cache/dev-haskell/monad-par-0.3.4.3
index 06ecd53dfa15..86dff89104b5 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.4.3
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.3.4.3
 SRC_URI=mirror://hackage/packages/archive/monad-par/0.3.4.3/monad-par-0.3.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6e0443f96d503be1904f64d547b04b62
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.4.5 b/metadata/md5-cache/dev-haskell/monad-par-0.3.4.5
index 96e06c7fde15..9e41a0435f77 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.4.5
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.4.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-6.12.1:= chaselev? ( dev-haskell/chaselev-deque:= )
 SLOT=0/0.3.4.5
 SRC_URI=mirror://hackage/packages/archive/monad-par/0.3.4.5/monad-par-0.3.4.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=942422190c812e243c73a0beb102ccdb
diff --git a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3 b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3
index b7d13eac1150..1f1c32f13f53 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3
+++ b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/abstract-par-0.3*:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/deepseq-1.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/monad-par-extras/0.3.3/monad-par-extras-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e516225113345486d9dd817f2c61a600
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.4 b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.4
index f8d769bda021..8182b23a69be 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.4
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-mtl/0.3.0.4/MonadCatchIO-mtl-0.3.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=517669feef1292efef731d52e6196fae
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5 b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
index c4f7400ad280..ceacb71d3a39 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.5
 SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-mtl/0.3.0.5/MonadCatchIO-mtl-0.3.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cbaa8aac1461237595c6542d3e17f970
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.0.0 b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.0.0
index b89222fe2fd3..0a1af9f86d9b 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.0.0
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.0
 SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-transformers/0.3.0.0/MonadCatchIO-transformers-0.3.0.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7d6b4958fe6f83716e598f7d880ee6f7
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.0 b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.0
index d886164a0740..1a579a7823e1 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.0
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.0
 SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-transformers/0.3.1.0/MonadCatchIO-transformers-0.3.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4ae27b6291a26a3fca54f1f7f6224d3a
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1
index 085349da21e7..67c0bec17866 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0.1
 SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.1/monads-tf-0.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=06be1a53ae02587f1751c8bd73b31545
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1-r1 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1-r1
index 20bb355235cb..07512f35b439 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0.1
 SRC_URI=mirror://hackage/packages/archive/monads-tf/0.1.0.1/monads-tf-0.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=630f56f78d30a3c5650e914a9176a6fe
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-0.1.0.0 b/metadata/md5-cache/dev-haskell/mono-traversable-0.1.0.0
index 096825e66a2d..c51b29cd8c39 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-0.1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.1.0.0
 SRC_URI=mirror://hackage/packages/archive/mono-traversable/0.1.0.0/mono-traversable-0.1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4f1fe87a50db49eb29e84b4cfea23212
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.0.1.0 b/metadata/md5-cache/dev-haskell/mtl-2.0.1.0
index 20eeb7ab564c..d40af93a1df7 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.0.1.0
+++ b/metadata/md5-cache/dev-haskell/mtl-2.0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/transformers-0.2* >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/mtl/2.0.1.0/mtl-2.0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=68d5acd638aa91e74852565074e95492
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.1.1 b/metadata/md5-cache/dev-haskell/mtl-2.1.1
index bab1b5a2d5e2..c55c3be374cc 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.1.1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/transformers-0.3*[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/mtl/2.1.1/mtl-2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4d9936524322860d5210ac3e1156a88d
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.1.2 b/metadata/md5-cache/dev-haskell/mtl-2.1.2
index 8ec2df189d78..03b74c8b1555 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.1.2
+++ b/metadata/md5-cache/dev-haskell/mtl-2.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/transformers-0.3*[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/mtl/2.1.2/mtl-2.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=10439a167c444334d8d40f484288e05a
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.1.2-r1 b/metadata/md5-cache/dev-haskell/mtl-2.1.2-r1
index 538cd25328b6..6c5560989074 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/transformers-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.2
 SRC_URI=mirror://hackage/packages/archive/mtl/2.1.2/mtl-2.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=61d102151adcbad14ecd90a8127e0d9e
diff --git a/metadata/md5-cache/dev-haskell/mwc-random-0.12.0.1 b/metadata/md5-cache/dev-haskell/mwc-random-0.12.0.1
index 3d9de8b47062..e027e269733c 100644
--- a/metadata/md5-cache/dev-haskell/mwc-random-0.12.0.1
+++ b/metadata/md5-cache/dev-haskell/mwc-random-0.12.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.12.0.1
 SRC_URI=mirror://hackage/packages/archive/mwc-random/0.12.0.1/mwc-random-0.12.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a8473f80de06bd3819755e0a3b2945cc
diff --git a/metadata/md5-cache/dev-haskell/mwc-random-0.13.1.0 b/metadata/md5-cache/dev-haskell/mwc-random-0.13.1.0
index ee86db8ad972..646aaa002a19 100644
--- a/metadata/md5-cache/dev-haskell/mwc-random-0.13.1.0
+++ b/metadata/md5-cache/dev-haskell/mwc-random-0.13.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.13.1.0
 SRC_URI=mirror://hackage/packages/archive/mwc-random/0.13.1.0/mwc-random-0.13.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3e6a849ce7471bc90a92fd8f48472920
diff --git a/metadata/md5-cache/dev-haskell/nanospec-0.1.0 b/metadata/md5-cache/dev-haskell/nanospec-0.1.0
index 165be26989a7..17826fe79de5 100644
--- a/metadata/md5-cache/dev-haskell/nanospec-0.1.0
+++ b/metadata/md5-cache/dev-haskell/nanospec-0.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0
 SRC_URI=mirror://hackage/packages/archive/nanospec/0.1.0/nanospec-0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=16404416ee48b02684bd8762d7f354b4
diff --git a/metadata/md5-cache/dev-haskell/nats-0.1 b/metadata/md5-cache/dev-haskell/nats-0.1
index 56ba2cf1db5c..de9207755066 100644
--- a/metadata/md5-cache/dev-haskell/nats-0.1
+++ b/metadata/md5-cache/dev-haskell/nats-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1
 SRC_URI=mirror://hackage/packages/archive/nats/0.1/nats-0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=61648f64d8a6b447235e0842c68543c0
diff --git a/metadata/md5-cache/dev-haskell/nats-0.1.2 b/metadata/md5-cache/dev-haskell/nats-0.1.2
index 0108a4c734c8..be1fb035b9de 100644
--- a/metadata/md5-cache/dev-haskell/nats-0.1.2
+++ b/metadata/md5-cache/dev-haskell/nats-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/nats/0.1.2/nats-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8514bae108e7813b8f5e969c5c93e9cf
diff --git a/metadata/md5-cache/dev-haskell/network-2.2.1.7 b/metadata/md5-cache/dev-haskell/network-2.2.1.7
index e5f31d5d8ef2..939f2950b272 100644
--- a/metadata/md5-cache/dev-haskell/network-2.2.1.7
+++ b/metadata/md5-cache/dev-haskell/network-2.2.1.7
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/parsec
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.2.1.7/network-2.2.1.7.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0a1b748fdacc1b5865c1e0b9567b4c36
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.11 b/metadata/md5-cache/dev-haskell/network-2.3.0.11
index 24050a2d4a06..dacece00d7ad 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.11
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.11/network-2.3.0.11.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=16f4f5a2fbca851e9e281ac9440f2709
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.13 b/metadata/md5-cache/dev-haskell/network-2.3.0.13
index d1202fcfbe6e..fb7f2e9bc173 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.13
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.13/network-2.3.0.13.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3ad1561ca252a312c198166c3b720cc5
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.14 b/metadata/md5-cache/dev-haskell/network-2.3.0.14
index f42893a54a23..1ff4843d5cad 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.14
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.14/network-2.3.0.14.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1ac11aef71c5739c9ec4ae2bb3dc3ae7
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.2 b/metadata/md5-cache/dev-haskell/network-2.3.0.2
index 1df590f7b805..2145a507f51c 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.2
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.2/network-2.3.0.2.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d7407e832a7630c52d41f3a4dd90ddb2
diff --git a/metadata/md5-cache/dev-haskell/network-2.3.0.7 b/metadata/md5-cache/dev-haskell/network-2.3.0.7
index 195ca3b6bb94..7fb66d2a8d79 100644
--- a/metadata/md5-cache/dev-haskell/network-2.3.0.7
+++ b/metadata/md5-cache/dev-haskell/network-2.3.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/parsec >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/network/2.3.0.7/network-2.3.0.7.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1a31162fd5cccfef508f3238a9b6501b
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.0.1 b/metadata/md5-cache/dev-haskell/network-2.4.0.1
index ed033382471c..f9fa9d8799bd 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.0.1
+++ b/metadata/md5-cache/dev-haskell/network-2.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.0.1
 SRC_URI=mirror://hackage/packages/archive/network/2.4.0.1/network-2.4.0.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=60ed0c48fd7109279b3fee3bd4b9f9c0
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.0 b/metadata/md5-cache/dev-haskell/network-2.4.1.0
index e7c3e21dddb3..dd0ff9beb39e 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.0
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1.0
 SRC_URI=mirror://hackage/packages/archive/network/2.4.1.0/network-2.4.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b31f9eb0e407cd81f3452ba7b0f51932
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
index 29889a0c92a6..a153ae57eaae 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1.2
 SRC_URI=mirror://hackage/packages/archive/network/2.4.1.2/network-2.4.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2fe6420186523890ac44e42808e3dbd0
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2-r1 b/metadata/md5-cache/dev-haskell/network-2.4.1.2-r1
index c54488940170..d22e2dfcd845 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1.2
 SRC_URI=mirror://hackage/packages/archive/network/2.4.1.2/network-2.4.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea32199053807ece6eb458e98027730b
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.0 b/metadata/md5-cache/dev-haskell/network-2.4.2.0
index 1897a7c3a793..f8f8fab03d7f 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.0
+++ b/metadata/md5-cache/dev-haskell/network-2.4.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.2.0
 SRC_URI=mirror://hackage/packages/archive/network/2.4.2.0/network-2.4.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a41a759e777183ba7084d3aeb27b0fed
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.1 b/metadata/md5-cache/dev-haskell/network-2.4.2.1
index 9829e679788c..f41fc140ed64 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.1
+++ b/metadata/md5-cache/dev-haskell/network-2.4.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.2.1
 SRC_URI=mirror://hackage/packages/archive/network/2.4.2.1/network-2.4.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=75e2adbece42a4da9094b69a6245b336
diff --git a/metadata/md5-cache/dev-haskell/network-bytestring-0.1.3.4 b/metadata/md5-cache/dev-haskell/network-bytestring-0.1.3.4
index 3e5eda5b1c39..e61f6d708a9c 100644
--- a/metadata/md5-cache/dev-haskell/network-bytestring-0.1.3.4
+++ b/metadata/md5-cache/dev-haskell/network-bytestring-0.1.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/network-2.2.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3.4
 SRC_URI=mirror://hackage/packages/archive/network-bytestring/0.1.3.4/network-bytestring-0.1.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=87a2be5a48941c8faaa05588b65f9b80
diff --git a/metadata/md5-cache/dev-haskell/network-conduit-1.0.0-r1 b/metadata/md5-cache/dev-haskell/network-conduit-1.0.0-r1
index 4bbc730c9485..64b349ba808e 100644
--- a/metadata/md5-cache/dev-haskell/network-conduit-1.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/network-conduit-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/network-2.3:=[profile?]
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/network-conduit/1.0.0/network-conduit-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=879114f1328e387e2303b562b323ecdd
diff --git a/metadata/md5-cache/dev-haskell/network-info-0.2.0.3 b/metadata/md5-cache/dev-haskell/network-info-0.2.0.3
index 69c70e3a5792..a548b8e588ca 100644
--- a/metadata/md5-cache/dev-haskell/network-info-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/network-info-0.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0.3
 SRC_URI=mirror://hackage/packages/archive/network-info/0.2.0.3/network-info-0.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=04fe96c06592d7e6aedda2cb1a99d2d9
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.0.10 b/metadata/md5-cache/dev-haskell/network-multicast-0.0.10
index cc89928089bd..8a8423227072 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.0.10
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.0.10
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.10
 SRC_URI=mirror://hackage/packages/archive/network-multicast/0.0.10/network-multicast-0.0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3c8a1285354794962a317601d8fdf8fb
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.0.7 b/metadata/md5-cache/dev-haskell/network-multicast-0.0.7
index d162d3a5c1cc..06516c505ef4 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.0.7
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.0.7
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.7
 SRC_URI=mirror://hackage/packages/archive/network-multicast/0.0.7/network-multicast-0.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=69aac1748849f3c7edc492c7733cfcf7
diff --git a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.4 b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.4
index c52caa7b9a7d..08147ecb8ad2 100644
--- a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.4
+++ b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-haskell/gnuidn-0.2*:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] =dev-haskell/gsasl-0.3*:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] =dev-haskell/monads-tf-0.1*:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/network-protocol-xmpp/0.4.4/network-protocol-xmpp-0.4.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=107bb9c0daf83dd9c6feb1970251e5cc
diff --git a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.5 b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.5
index 2562f90d2b0b..e445ca4c4aff 100644
--- a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.5
+++ b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-haskell/gnuidn-0.2*:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] =dev-haskell/gsasl-0.3*:=[profile?] =dev-haskell/libxml-sax-0.7*:=[profile?] =dev-haskell/monads-tf-0.1*:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] =dev-haskell/xml-types-0.3*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.5
 SRC_URI=mirror://hackage/packages/archive/network-protocol-xmpp/0.4.5/network-protocol-xmpp-0.4.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9958d750aea8c2fecbce72f58522af40
diff --git a/metadata/md5-cache/dev-haskell/objectname-1.0.0.0 b/metadata/md5-cache/dev-haskell/objectname-1.0.0.0
index befe0b9dcd98..60f8b01f843d 100644
--- a/metadata/md5-cache/dev-haskell/objectname-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/objectname-1.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ObjectName/1.0.0.0/ObjectName-1.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ad4d6629d5a5491c27d4b53b1e28eb8f
diff --git a/metadata/md5-cache/dev-haskell/openal-1.3.1.1 b/metadata/md5-cache/dev-haskell/openal-1.3.1.1
index b5f5e7d4df2a..e2a6abf15008 100644
--- a/metadata/md5-cache/dev-haskell/openal-1.3.1.1
+++ b/metadata/md5-cache/dev-haskell/openal-1.3.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.4 >=dev-haskell/opengl-2.2.1 media-libs/openal
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/OpenAL/1.3.1.1/OpenAL-1.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a565e090325820aff39d0c93d7443831
diff --git a/metadata/md5-cache/dev-haskell/openal-1.4.0.1 b/metadata/md5-cache/dev-haskell/openal-1.4.0.1
index 2b657ddb6c05..2d70bfa8a362 100644
--- a/metadata/md5-cache/dev-haskell/openal-1.4.0.1
+++ b/metadata/md5-cache/dev-haskell/openal-1.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/objectname[profile?] dev-haskell/statevar[profile?] dev-haskell/tensor[profile?] >=dev-lang/ghc-6.8.2 media-libs/openal
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/OpenAL/1.4.0.1/OpenAL-1.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6059831b80c80de589472cd1c7d89563
diff --git a/metadata/md5-cache/dev-haskell/openal-1.4.0.2 b/metadata/md5-cache/dev-haskell/openal-1.4.0.2
index fcd42318dad0..2e92c0dcc6f5 100644
--- a/metadata/md5-cache/dev-haskell/openal-1.4.0.2
+++ b/metadata/md5-cache/dev-haskell/openal-1.4.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/objectname:=[profile?] dev-haskell/statevar:=[profile?] dev-haskell/tensor:=[profile?] media-libs/openal >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.4.0.2
 SRC_URI=mirror://hackage/packages/archive/OpenAL/1.4.0.2/OpenAL-1.4.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c643531624779a7b07fa23b5188b55ab
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.2.1.1 b/metadata/md5-cache/dev-haskell/opengl-2.2.1.1
index 0303922bb952..fe2002310095 100644
--- a/metadata/md5-cache/dev-haskell/opengl-2.2.1.1
+++ b/metadata/md5-cache/dev-haskell/opengl-2.2.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.4 virtual/opengl virtual/glu media-libs/freeglut
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/OpenGL/2.2.1.1/OpenGL-2.2.1.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fa51bb5f2380329dcb5c54e15b7cae91
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.5.0.0 b/metadata/md5-cache/dev-haskell/opengl-2.5.0.0
index e2c35deb4439..e31bd51f74c8 100644
--- a/metadata/md5-cache/dev-haskell/opengl-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/opengl-2.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/gluraw-1.1.0.0[profile?] =dev-haskell/objectname-1.0*[profile?] >=dev-haskell/openglraw-1.1.0.0[profile?] =dev-haskell/statevar-1.0*[profile?] =dev-haskell/tensor-1.0*[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/OpenGL/2.5.0.0/OpenGL-2.5.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b8c0febf46f7fb6652afbc58470a96d6
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.6.0.1 b/metadata/md5-cache/dev-haskell/opengl-2.6.0.1
index 9c2575bf24b2..b358f196d51c 100644
--- a/metadata/md5-cache/dev-haskell/opengl-2.6.0.1
+++ b/metadata/md5-cache/dev-haskell/opengl-2.6.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] =dev-haskell/objectname-1.0*:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.6.0.1
 SRC_URI=mirror://hackage/packages/archive/OpenGL/2.6.0.1/OpenGL-2.6.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=186a7be03206f2f1713af214a91e64c9
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.8.0.0 b/metadata/md5-cache/dev-haskell/opengl-2.8.0.0
index 0a163beb8382..302b728edef7 100644
--- a/metadata/md5-cache/dev-haskell/opengl-2.8.0.0
+++ b/metadata/md5-cache/dev-haskell/opengl-2.8.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.8.0.0
 SRC_URI=mirror://hackage/packages/archive/OpenGL/2.8.0.0/OpenGL-2.8.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8feb3d6c862b10ce921eb9139a648195
diff --git a/metadata/md5-cache/dev-haskell/openglraw-1.2.0.0 b/metadata/md5-cache/dev-haskell/openglraw-1.2.0.0
index 0d3d77a9126b..6fb537942b46 100644
--- a/metadata/md5-cache/dev-haskell/openglraw-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/openglraw-1.2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2 virtual/opengl
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/1.2.0.0/OpenGLRaw-1.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=332077dc4ca39edfa0f62c39a7b9ed33
diff --git a/metadata/md5-cache/dev-haskell/openglraw-1.3.0.0 b/metadata/md5-cache/dev-haskell/openglraw-1.3.0.0
index 5c32c4a64b9e..2bddf4de5123 100644
--- a/metadata/md5-cache/dev-haskell/openglraw-1.3.0.0
+++ b/metadata/md5-cache/dev-haskell/openglraw-1.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= virtual/opengl
 SLOT=0/1.3.0.0
 SRC_URI=mirror://hackage/packages/archive/OpenGLRaw/1.3.0.0/OpenGLRaw-1.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7d5ccb94a61ed2940cf5b4adfc98747c
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.5.2.1 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.5.2.1
index ff27ec007130..458c9480c645 100644
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.5.2.1
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.5.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.2.1
 SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.5.2.1/optparse-applicative-0.5.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8eb6c4930e107b5d018320002442d0e9
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.7.0.2 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.7.0.2
index c79b681dc5e7..c99d28169bfe 100644
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.7.0.2
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.7.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.0.2
 SRC_URI=mirror://hackage/packages/archive/optparse-applicative/0.7.0.2/optparse-applicative-0.7.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=45907de00a70b4492ed659cc7409cade
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
index cfb8f27d69a0..5fc64b5ae210 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/pandoc-1.12.0.2:=[profile?] dev-haskell/aeson:=[profile?] dev
 RESTRICT=test
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.1.2.1/pandoc-citeproc-0.1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8db5680aeb33e808cca8af84b3aed547
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
index 91bbb527f5cb..fc7457a44e1a 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-h
 RESTRICT=test
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.2/pandoc-citeproc-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=003e690fba262da8cc843fef1fbdb0c8
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.10 b/metadata/md5-cache/dev-haskell/pandoc-types-1.10
index 465ccf2c8c6f..e5b9aa63febc 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.10
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.10
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.10/pandoc-types-1.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ee9d586f7dd507b9f8e88a3c08253831
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.12 b/metadata/md5-cache/dev-haskell/pandoc-types-1.12
index 4bc3e2281294..06cd1e509eb9 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.12
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.12
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12/pandoc-types-1.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d17444577d6fd3764e8547e92a21947
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.12.1.2 b/metadata/md5-cache/dev-haskell/pandoc-types-1.12.1.2
index 83bd39831f47..a6c69a36702a 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.12.1.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.12.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.12.1.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12.1.2/pandoc-types-1.12.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=276a515064a1912fc6bcb323ea591ad2
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.12.3 b/metadata/md5-cache/dev-haskell/pandoc-types-1.12.3
index 601965ff89f3..0e163b321b14 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.12.3
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.12.3
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.12.3/pandoc-types-1.12.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c27297088523f936505059b0efb45b40
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.8 b/metadata/md5-cache/dev-haskell/pandoc-types-1.8
index 7661a5cb45a9..8cb8bce43799 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.8
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.8/pandoc-types-1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=df91d1d62ecf59caec6eafe15a72e13e
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.9.1 b/metadata/md5-cache/dev-haskell/pandoc-types-1.9.1
index 096d260b0d52..53736fbbda9e 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.9.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.12.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pandoc-types/1.9.1/pandoc-types-1.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f015bfb38f88a7e379393bc0d99aadd7
diff --git a/metadata/md5-cache/dev-haskell/pango-0.12.0 b/metadata/md5-cache/dev-haskell/pango-0.12.0
index b9d377b449a4..daec908d0125 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.12.0
+++ b/metadata/md5-cache/dev-haskell/pango-0.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/cairo-0.12*:0 =dev-haskell/glib-0.12*:0 dev-haskell/mtl >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pango/0.12.0/pango-0.12.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05414c5baf5011716dcc10fd380cf2aa
diff --git a/metadata/md5-cache/dev-haskell/pango-0.12.3 b/metadata/md5-cache/dev-haskell/pango-0.12.3
index 742fed1bcbc9..ed1326173a47 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.12.3
+++ b/metadata/md5-cache/dev-haskell/pango-0.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-haskell/cairo-0.12*:0[profile?] =dev-haskell/glib-0.12*:0[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pango/0.12.3/pango-0.12.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5776a9dd5d9dfbae7e933fbb3400e116
diff --git a/metadata/md5-cache/dev-haskell/pango-0.12.4-r1 b/metadata/md5-cache/dev-haskell/pango-0.12.4-r1
index cab12ae53cd5..fac11a1e4a8f 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.12.4-r1
+++ b/metadata/md5-cache/dev-haskell/pango-0.12.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the Pango text rendering engine.
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.12.0:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.0:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo x11-libs/pango
 SLOT=0/0.12.4
 SRC_URI=mirror://hackage/packages/archive/pango/0.12.4/pango-0.12.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6684f6061ff84ca31911941fc7d2ac5e
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=40fcb6c3826deaf323f476d2e4587139
diff --git a/metadata/md5-cache/dev-haskell/pango-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/pango-0.12.5.0-r1
index 7621e147ac83..38cc601444be 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/pango-0.12.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.12.5:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?] >=dev-haskell/glib-0.12.5:0=[profile?] <dev-haskell/glib-0.13:0=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo x11-libs/pango
 SLOT=0/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/pango/0.12.5.0/pango-0.12.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1a69c348896e4829b79ca422d194d93b
diff --git a/metadata/md5-cache/dev-haskell/parallel-1.0.0.0 b/metadata/md5-cache/dev-haskell/parallel-1.0.0.0
index 01fdc4af7919..43f8341aae74 100644
--- a/metadata/md5-cache/dev-haskell/parallel-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/parallel-1.0.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/parallel/1.0.0.0/parallel-1.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=19c2d83256317a9766c7760035b37d32
diff --git a/metadata/md5-cache/dev-haskell/parallel-1.1.0.1 b/metadata/md5-cache/dev-haskell/parallel-1.1.0.1
index 1119fcf19bbb..2d09c8791222 100644
--- a/metadata/md5-cache/dev-haskell/parallel-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/parallel-1.1.0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/parallel/1.1.0.1/parallel-1.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5d69b7e35de877a9e57ca2c54ee1fffe
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.0.2 b/metadata/md5-cache/dev-haskell/parallel-3.2.0.2
index 505f11d9171f..443d187c116e 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.0.2
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/deepseq-1.4 >=dev-lang/ghc-6.8.2
 SLOT=3
 SRC_URI=mirror://hackage/packages/archive/parallel/3.2.0.2/parallel-3.2.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3bf3863523b4d1e10761b0454b6ecf2d
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.0.3 b/metadata/md5-cache/dev-haskell/parallel-3.2.0.3
index ec6a0109d22f..a59c3d44e0b5 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.0.3
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=3/3.2.0.3
 SRC_URI=mirror://hackage/packages/archive/parallel/3.2.0.3/parallel-3.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=58644e8bc2c96b6e7a5f0dbb09f97ef8
diff --git a/metadata/md5-cache/dev-haskell/parsec-2.1.0.1 b/metadata/md5-cache/dev-haskell/parsec-2.1.0.1
index db3d98822463..3ec5a6fdbee1 100644
--- a/metadata/md5-cache/dev-haskell/parsec-2.1.0.1
+++ b/metadata/md5-cache/dev-haskell/parsec-2.1.0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/parsec/2.1.0.1/parsec-2.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a2919c70922a0cc331fa075cd6d45261
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.2-r1 b/metadata/md5-cache/dev-haskell/parsec-3.1.2-r1
index a72e005f4031..8976ced95550 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.2[profile?] <dev-haskell/text-0.12[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.2/parsec-3.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b6994ffd6331c31eee436b4c621550a8
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.3 b/metadata/md5-cache/dev-haskell/parsec-3.1.3
index 3eff9b8f2496..1cadfe1edca9 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.3
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.2[profile?] <dev-haskell/text-0.12[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.3/parsec-3.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7945e3ac25055147e1b74c3070c8b9b0
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.4 b/metadata/md5-cache/dev-haskell/parsec-3.1.4
index 3c6090cdfb96..64938920d0d8 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.4
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.1.4
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.4/parsec-3.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e8082ded951d5779e1cf12ce63bd8788
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.1.2 b/metadata/md5-cache/dev-haskell/path-pieces-0.1.2
index 86ef746ed888..86bf447d76ec 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.1.2
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.5[profile?] <dev-haskell/text-0.12[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/path-pieces/0.1.2/path-pieces-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=311910d4d5a531176895aa74c4a084d0
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.1.3 b/metadata/md5-cache/dev-haskell/path-pieces-0.1.3
index 4c88c17d17dd..8a28aa3c111a 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.1.3
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/path-pieces/0.1.3/path-pieces-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c03ad1c1cca1e3207049c8297167ef56
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.1.3.1 b/metadata/md5-cache/dev-haskell/path-pieces-0.1.3.1
index f360ead255b5..6c8e91ce6f10 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.1.3.1
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.3.1
 SRC_URI=mirror://hackage/packages/archive/path-pieces/0.1.3.1/path-pieces-0.1.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8fc140a5b0f8f203ecb66ee92cd4831e
diff --git a/metadata/md5-cache/dev-haskell/pcap-0.4.5.1 b/metadata/md5-cache/dev-haskell/pcap-0.4.5.1
index 8389b9bdcdee..60c11c38aac3 100644
--- a/metadata/md5-cache/dev-haskell/pcap-0.4.5.1
+++ b/metadata/md5-cache/dev-haskell/pcap-0.4.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/network >=dev-lang/ghc-6.8.2 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pcap/0.4.5.1/pcap-0.4.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f938e9e59593ae99bf72d955f65ec8c
diff --git a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1 b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
index f7d89af86170..b3c119d5958d 100644
--- a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A system-independent interface for user-level packet capture
 EAPI=5
 HOMEPAGE=https://github.com/bos/pcap
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap
 SLOT=0/0.4.5.2
 SRC_URI=mirror://hackage/packages/archive/pcap/0.4.5.2/pcap-0.4.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=69b69fba8af403938da5f30eabc361a2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=6d74c21de7734fc5b3fcdbbb92fc3462
diff --git a/metadata/md5-cache/dev-haskell/pcre-light-0.4 b/metadata/md5-cache/dev-haskell/pcre-light-0.4
index 0a7538ccc319..f1896b07039d 100644
--- a/metadata/md5-cache/dev-haskell/pcre-light-0.4
+++ b/metadata/md5-cache/dev-haskell/pcre-light-0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2 dev-libs/libpcre
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pcre-light/0.4/pcre-light-0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d0da9d3c4ff3638cd071f1471ecca8af
diff --git a/metadata/md5-cache/dev-haskell/pcre-light-0.4-r1 b/metadata/md5-cache/dev-haskell/pcre-light-0.4-r1
index b9328884d4a0..169f59ba5d66 100644
--- a/metadata/md5-cache/dev-haskell/pcre-light-0.4-r1
+++ b/metadata/md5-cache/dev-haskell/pcre-light-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libpcre
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/pcre-light/0.4/pcre-light-0.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d907a11b722e86fbfe49572cd95119f1
diff --git a/metadata/md5-cache/dev-haskell/pem-0.1.2 b/metadata/md5-cache/dev-haskell/pem-0.1.2
index 0ef38bf33a54..1111b8d958dc 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.1.2
+++ b/metadata/md5-cache/dev-haskell/pem-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/pem/0.1.2/pem-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4f4cc38052d59c0e16628b6059b8529f
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.0 b/metadata/md5-cache/dev-haskell/pem-0.2.0
index 3e127a879ac5..845a0a08cdf6 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.0
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/pem/0.2.0/pem-0.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=162751d63d081456f631f46cc22f7b0c
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.1 b/metadata/md5-cache/dev-haskell/pem-0.2.1
index b9183317cea4..ffd67e8ac4b9 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.1
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/pem/0.2.1/pem-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b983316485be070051cc65994b4c3acf
diff --git a/metadata/md5-cache/dev-haskell/persistent-1.1.5.1 b/metadata/md5-cache/dev-haskell/persistent-1.1.5.1
index 970850393d20..bb09e1026176 100644
--- a/metadata/md5-cache/dev-haskell/persistent-1.1.5.1
+++ b/metadata/md5-cache/dev-haskell/persistent-1.1.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-0.5.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.2.3:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/pool-conduit-0.1.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.1.5.1
 SRC_URI=mirror://hackage/packages/archive/persistent/1.1.5.1/persistent-1.1.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd6560641f9a87ef6f523466663581e3
diff --git a/metadata/md5-cache/dev-haskell/persistent-1.2.3.0 b/metadata/md5-cache/dev-haskell/persistent-1.2.3.0
index f30adb66cef0..bc037fc25821 100644
--- a/metadata/md5-cache/dev-haskell/persistent-1.2.3.0
+++ b/metadata/md5-cache/dev-haskell/persistent-1.2.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/monad-logger-0.3:=[profile?] >=dev-haskell/path-pieces-0.1:=[profile?] >=dev-haskell/pool-conduit-0.1.2:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.3.0
 SRC_URI=mirror://hackage/packages/archive/persistent/1.2.3.0/persistent-1.2.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ef6739b300518b2352edff828de8a90e
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.1.5 b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.1.5
index 07a61abe71d6..a739e4175e43 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.1.5
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] >=dev-haskell/persistent-1.1.5:=[profile?] <dev-haskell/persistent-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= systemlib? ( >=dev-db/sqlite-3.0 )
 SLOT=0/1.1.5
 SRC_URI=mirror://hackage/packages/archive/persistent-sqlite/1.1.5/persistent-sqlite-1.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0347129fd10a46ffed15bdaa59eb6861
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.0 b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.0
index 51c6afde5bbd..9895e2ecca0b 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.0
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= systemlib? ( >=dev-db/sqlite-3.0 )
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/persistent-sqlite/1.2.0/persistent-sqlite-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c869033df4c9b6c5b9395208d3e5a67f
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.1-r1 b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.1-r1
index 0f2dc0ea49ed..020c53f07439 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/conduit-0.5.3:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] >=dev-haskell/monad-logger-0.2.4:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= systemlib? ( >=dev-db/sqlite-3.0 )
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/persistent-sqlite/1.2.1/persistent-sqlite-1.2.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d7e49adf73027f1f15dbac3304788798
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-1.1.3.1 b/metadata/md5-cache/dev-haskell/persistent-template-1.1.3.1
index 0a66b302ed94..e548867c4490 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-1.1.3.1
+++ b/metadata/md5-cache/dev-haskell/persistent-template-1.1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/persistent-1.1.2:=[profile?] <dev-haskell/persistent-1.2:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.3.1
 SRC_URI=mirror://hackage/packages/archive/persistent-template/1.1.3.1/persistent-template-1.1.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d2693a33a78d92716857921eea0cb2a4
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.1 b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.1
index 842033cc98e6..0d309a5f1b44 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/monad-logger:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.1
 SRC_URI=mirror://hackage/packages/archive/persistent-template/1.2.0.1/persistent-template-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8bfc20dfa6160894345d3e5b182a32e2
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.2 b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.2
index 67f30a72a0aa..32fccc8b8ea1 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/monad-logger:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.2
 SRC_URI=mirror://hackage/packages/archive/persistent-template/1.2.0.2/persistent-template-1.2.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=44825673ff8c4232f036d1afd698f98b
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.6 b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.6
index d42aef05c078..57f7483362be 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.6
+++ b/metadata/md5-cache/dev-haskell/persistent-template-1.2.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.6
 SRC_URI=mirror://hackage/packages/archive/persistent-template/1.2.0.6/persistent-template-1.2.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dea0ba3c79930d995bf285e68e2fe7a7
diff --git a/metadata/md5-cache/dev-haskell/pointed-4.0 b/metadata/md5-cache/dev-haskell/pointed-4.0
index 5933fa07db22..f687ea760e8b 100644
--- a/metadata/md5-cache/dev-haskell/pointed-4.0
+++ b/metadata/md5-cache/dev-haskell/pointed-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/pointed/4.0/pointed-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e2e9890c63d8820a49bd79ab30d7a94f
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.8 b/metadata/md5-cache/dev-haskell/polyparse-1.8
index 19bd90975a76..91c89daf5c1f 100644
--- a/metadata/md5-cache/dev-haskell/polyparse-1.8
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/text[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/polyparse/1.8/polyparse-1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dc582a449c35b3d2503bc8f353720b51
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.9 b/metadata/md5-cache/dev-haskell/polyparse-1.9
index c4c93c2a6339..191c4dec257d 100644
--- a/metadata/md5-cache/dev-haskell/polyparse-1.9
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.9
 SRC_URI=mirror://hackage/packages/archive/polyparse/1.9/polyparse-1.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dc87e1172c755e5bed199b9e617ae957
diff --git a/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2 b/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2
index ba9a92db26ee..80e8a7972150 100644
--- a/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2
+++ b/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/monad-control:=[profile?] >=dev-haskell/resource-pool-0.2.1:=[profile?] <dev-haskell/resource-pool-0.3:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/pool-conduit/0.1.2/pool-conduit-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=697c95337ea79545829b670ff3f9959f
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.4.1 b/metadata/md5-cache/dev-haskell/primitive-0.4.1
index e063df91ce4d..2ed679faef9e 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.4.1
+++ b/metadata/md5-cache/dev-haskell/primitive-0.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.4.1/primitive-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0434f65fb99b7774973428794d1ef238
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.5.0.1 b/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
index c342faec02b9..e0f98cf88a8d 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.3:=
 SLOT=0/0.5.0.1
 SRC_URI=mirror://hackage/packages/archive/primitive/0.5.0.1/primitive-0.5.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8b95c222029bb2517583a40542f8a968
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.5.1.0 b/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
index 9c4f3a18b2fe..298a945c9475 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Primitive memory-related operations
 EAPI=5
 HOMEPAGE=https://github.com/haskell/primitive
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.5.1.0/primitive-0.5.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2aa5f23a8b475d890b4072013583ce09
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=df98262b7bf62c3c39343f4d89f776e5
diff --git a/metadata/md5-cache/dev-haskell/process-conduit-1.0.0.1 b/metadata/md5-cache/dev-haskell/process-conduit-1.0.0.1
index c6436feb1d5e..b3d261d5794c 100644
--- a/metadata/md5-cache/dev-haskell/process-conduit-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/process-conduit-1.0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] =dev-haskell/control-monad-loop-0.1*:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.0.0.1
 SRC_URI=mirror://hackage/packages/archive/process-conduit/1.0.0.1/process-conduit-1.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8f4936cee6a685b85d34494cf61fb170
diff --git a/metadata/md5-cache/dev-haskell/profunctor-extras-3.3.3.1 b/metadata/md5-cache/dev-haskell/profunctor-extras-3.3.3.1
index fe1b92452a33..c127cc317e9b 100644
--- a/metadata/md5-cache/dev-haskell/profunctor-extras-3.3.3.1
+++ b/metadata/md5-cache/dev-haskell/profunctor-extras-3.3.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] >=dev-haskell/semigroupoid-extras-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.3.3.1
 SRC_URI=mirror://hackage/packages/archive/profunctor-extras/3.3.3.1/profunctor-extras-3.3.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d864b46774d71511fcf2a4e85829be3c
diff --git a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0 b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
index 5be8e65ea7e3..f52cfed7281f 100644
--- a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
+++ b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/profunctor-extras/4.0/profunctor-extras-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=baf343f448305b3b57c8df9e6a349438
diff --git a/metadata/md5-cache/dev-haskell/profunctors-3.3.0.1 b/metadata/md5-cache/dev-haskell/profunctors-3.3.0.1
index 06a2bea8902e..57b6f5b5ada4 100644
--- a/metadata/md5-cache/dev-haskell/profunctors-3.3.0.1
+++ b/metadata/md5-cache/dev-haskell/profunctors-3.3.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/comonad-3*:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.3.0.1
 SRC_URI=mirror://hackage/packages/archive/profunctors/3.3.0.1/profunctors-3.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=33b848d9fcb357836da612e2858eee8c
diff --git a/metadata/md5-cache/dev-haskell/profunctors-4.0.1 b/metadata/md5-cache/dev-haskell/profunctors-4.0.1
index 54fe4cfb7153..da3ec260c4aa 100644
--- a/metadata/md5-cache/dev-haskell/profunctors-4.0.1
+++ b/metadata/md5-cache/dev-haskell/profunctors-4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0.1
 SRC_URI=mirror://hackage/packages/archive/profunctors/4.0.1/profunctors-4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=595ba4ddad1ff9a8728b8d02bb585512
diff --git a/metadata/md5-cache/dev-haskell/project-template-0.1.3 b/metadata/md5-cache/dev-haskell/project-template-0.1.3
index 1046d1e65730..be405a254f76 100644
--- a/metadata/md5-cache/dev-haskell/project-template-0.1.3
+++ b/metadata/md5-cache/dev-haskell/project-template-0.1.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/base64-conduit:=[p
 RESTRICT=test
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/project-template/0.1.3/project-template-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2ded27c819276b93b242756b86376c2
diff --git a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1 b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
index 70fdc3a46594..8703e704827f 100644
--- a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
+++ b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1
 SRC_URI=mirror://hackage/packages/archive/publicsuffixlist/0.1/publicsuffixlist-0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4e4b7f8945f42d8755171b4a8da7011f
diff --git a/metadata/md5-cache/dev-haskell/punycode-2.0 b/metadata/md5-cache/dev-haskell/punycode-2.0
index 93385f92398b..7d75e3d6f0aa 100644
--- a/metadata/md5-cache/dev-haskell/punycode-2.0
+++ b/metadata/md5-cache/dev-haskell/punycode-2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/t
 RESTRICT=test
 SLOT=0/2.0
 SRC_URI=mirror://hackage/packages/archive/punycode/2.0/punycode-2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=be4069c238611ac08007f190dc40d8d9
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.2.1 b/metadata/md5-cache/dev-haskell/puremd5-2.1.2.1
index 388e7dbab6c1..410c8ad0925a 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.2.1
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.0[profile?] >=dev-haskell/cereal-0.2[profile?] dev-haskell/crypto-api[profile?] dev-haskell/tagged[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pureMD5/2.1.2.1/pureMD5-2.1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0f5c3c3fe8aaad6b384596231f8602cd
diff --git a/metadata/md5-cache/dev-haskell/pwstore-fast-2.3 b/metadata/md5-cache/dev-haskell/pwstore-fast-2.3
index 301de08c7261..83872c40d846 100644
--- a/metadata/md5-cache/dev-haskell/pwstore-fast-2.3
+++ b/metadata/md5-cache/dev-haskell/pwstore-fast-2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1[profile?] >=dev-haskell/cryptohash-0.6[profile?] >=dev-haskell/random-1[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/pwstore-fast/2.3/pwstore-fast-2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b9fcaa73ca482dc25a04f54152b8f20d
diff --git a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.1 b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.1
index 1fe6293a495c..2493f6dd6f56 100644
--- a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.1
+++ b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/sha-1.6.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1
 SRC_URI=mirror://hackage/packages/archive/pwstore-fast/2.4.1/pwstore-fast-2.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b3cebd9dd4ad455ae810d904c74ed0e8
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0
index 9e49a70e5e74..4c9707c7f80b 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.1.0.0/QuickCheck-1.1.0.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6dc3f67304090a95594082504f188e70
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0
index 5a21721e354e..0471b52e2e4d 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.0/QuickCheck-1.2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=065766d977516a79ee0956e5bad2297f
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
index f2ba2ff43310..e3a6a9338be5 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.1/QuickCheck-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e183ac28ee1cadb2622e4d3a9eb9e5bb
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3 b/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3
index d2a6a176faf2..1deb44245b9d 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/cabal-1.2 dev-haskell/mtl
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.1.0.3/QuickCheck-2.1.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=34b80de4f2763c41a3b0f26f6db1fac2
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1
index 8a557d8372ce..11f02fe964cb 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl dev-haskell/random >=dev-lang/ghc-6.8.2
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.1.1.1/QuickCheck-2.1.1.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5bf14e8e67f256cc03c9973423e94858
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1
index b848b236465e..a7d5ae485d6a 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.1.1/QuickCheck-2.4.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7816988d4394b575cf74a3a575481630
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2
index 36a717ead9d3..13cb82ef6388 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.2/QuickCheck-2.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=daa67efb82eac8f21bc94fbe59b7f70c
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1
index 8a3c1eb339ab..71d4c35a8817 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random
 SLOT=2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.2/QuickCheck-2.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4ff514a0994bdeb09949684deb8e69e8
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1
index 3286c5339b48..2842780cb889 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2/2.5.1.1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.5.1.1/QuickCheck-2.5.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=23c4193fe08994742a19eb823f98a2ee
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.6
index 5ae00bc52a1b..c1cdacf48302 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2/2.6
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.6/QuickCheck-2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0d27630ff99ad491c9f07ff344e039e6
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.0 b/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.0
index d45bb8300af8..4d74124d72bf 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.5.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0
 SRC_URI=mirror://hackage/packages/archive/quickcheck-io/0.1.0/quickcheck-io-0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cee129772911f0c3c56f273297340b2e
diff --git a/metadata/md5-cache/dev-haskell/random-1.0.1.1 b/metadata/md5-cache/dev-haskell/random-1.0.1.1
index e34ef686284e..69accc80bff5 100644
--- a/metadata/md5-cache/dev-haskell/random-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/random-1.0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/random/1.0.1.1/random-1.0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6bdc2c55a66314e436edbe263aa42421
diff --git a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1 b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
index d75cd4aac4ce..f90871dc147e 100644
--- a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2:=
 SLOT=0/1.0.1.1
 SRC_URI=mirror://hackage/packages/archive/random/1.0.1.1/random-1.0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ef24b6dcbdbabdc28c9a8800172006d2
diff --git a/metadata/md5-cache/dev-haskell/ranges-0.2.4 b/metadata/md5-cache/dev-haskell/ranges-0.2.4
index a1c5f1326a1e..c4420fd52a4a 100644
--- a/metadata/md5-cache/dev-haskell/ranges-0.2.4
+++ b/metadata/md5-cache/dev-haskell/ranges-0.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ranges/0.2.4/ranges-0.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=78376ee555f7f4889d63aa042c20b32d
diff --git a/metadata/md5-cache/dev-haskell/readargs-1.2.1 b/metadata/md5-cache/dev-haskell/readargs-1.2.1
index c29fca35460a..8c0b7c26058a 100644
--- a/metadata/md5-cache/dev-haskell/readargs-1.2.1
+++ b/metadata/md5-cache/dev-haskell/readargs-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/ReadArgs/1.2.1/ReadArgs-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c762b09d13c9e11d7e490c7a5e7f8d2d
diff --git a/metadata/md5-cache/dev-haskell/readline-1.0.1.0 b/metadata/md5-cache/dev-haskell/readline-1.0.1.0
index b9497d805439..8c74d6b38a63 100644
--- a/metadata/md5-cache/dev-haskell/readline-1.0.1.0
+++ b/metadata/md5-cache/dev-haskell/readline-1.0.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/readline/1.0.1.0/readline-1.0.1.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=280ee81247ee283619f775a44a6c1dad
diff --git a/metadata/md5-cache/dev-haskell/readline-1.0.3.0 b/metadata/md5-cache/dev-haskell/readline-1.0.3.0
index c6fa2827b64c..4dfef7900279 100644
--- a/metadata/md5-cache/dev-haskell/readline-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/readline-1.0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.3.0
 SRC_URI=mirror://hackage/packages/archive/readline/1.0.3.0/readline-1.0.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ec38390869169dfcccb0e8d0bdb9185c
diff --git a/metadata/md5-cache/dev-haskell/recaptcha-0.1-r1 b/metadata/md5-cache/dev-haskell/recaptcha-0.1-r1
index 7bf4a13197f1..1ea8be2dd622 100644
--- a/metadata/md5-cache/dev-haskell/recaptcha-0.1-r1
+++ b/metadata/md5-cache/dev-haskell/recaptcha-0.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/network-2.2.0.1:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1
 SRC_URI=mirror://hackage/packages/archive/recaptcha/0.1/recaptcha-0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6ba9b2e02bd9158dde950b60d7739cdd
diff --git a/metadata/md5-cache/dev-haskell/reflection-1.3.2 b/metadata/md5-cache/dev-haskell/reflection-1.3.2
index cf7439249795..5bf0c2de36d1 100644
--- a/metadata/md5-cache/dev-haskell/reflection-1.3.2
+++ b/metadata/md5-cache/dev-haskell/reflection-1.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.2
 SRC_URI=mirror://hackage/packages/archive/reflection/1.3.2/reflection-1.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=017eadf90a639d4c7d08499555d4cd4e
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.93.2 b/metadata/md5-cache/dev-haskell/regex-base-0.93.2
index cb927830165c..29dd8f0787ef 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.93.2
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.93.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6 dev-haskell/mtl[profile?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-base/0.93.2/regex-base-0.93.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da06e559c15d24f67ad074c04e0a02c8
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1 b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
index e187b39e8e05..07c276e77a30 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.93.2
 SRC_URI=mirror://hackage/packages/archive/regex-base/0.93.2/regex-base-0.93.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c26eeec8537c96d9e4c5c0a985346d98
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1
index 70d5c0913001..1c03693326d4 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-haskell/regex-posix-0.95.1[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-compat/0.95.1/regex-compat-0.95.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a363c67a4f0f535743b134f800e4a681
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.2.1.7.7 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.2.1.7.7
index 0d6b9859edd2..0b9edd712a43 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.2.1.7.7
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.2.1.7.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.2.1.7.7/regex-pcre-builtin-0.94.2.1.7.7.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=38ad28582a6b7def3b8ac05514b550f3
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.1.8.31 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.1.8.31
index c7027e69dc2c..aee06d8ebdf9 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.1.8.31
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.1.8.31
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libpcre
 SLOT=0/0.94.4.1.8.31
 SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.4.1.8.31/regex-pcre-builtin-0.94.4.1.8.31.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0c10fe7c332ce57c348435bf7d5883fb
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.3.8.31 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.3.8.31
index adea2591de40..243e64ea2afc 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.3.8.31
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.3.8.31
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.94.4.3.8.31
 SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.4.3.8.31/regex-pcre-builtin-0.94.4.3.8.31.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0c3188940966171ccd2ae6e3e416c0a0
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.5.8.31 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.5.8.31
index 6d94e713cc42..b05ed3f8c25c 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.5.8.31
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.5.8.31
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.94.4.5.8.31
 SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.4.5.8.31/regex-pcre-builtin-0.94.4.5.8.31.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=77d7016f3623ab3a6a83b64520182d9e
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.7.8.31 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.7.8.31
index 988278837fd3..886b2d0b8282 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.7.8.31
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.94.4.7.8.31
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.94.4.7.8.31
 SRC_URI=mirror://hackage/packages/archive/regex-pcre-builtin/0.94.4.7.8.31/regex-pcre-builtin-0.94.4.7.8.31.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da458e93416e454b0605c9a13588f3a5
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.95.1 b/metadata/md5-cache/dev-haskell/regex-posix-0.95.1
index 656fd0f6c66f..293e476e115f 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.95.1
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.95.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-posix/0.95.1/regex-posix-0.95.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1c9e0f17bb643ca99171e11af134cd6e
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2 b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
index 869e946045ee..349139b75801 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-posix/0.95.2/regex-posix-0.95.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fedd30a31177558e44667d14488947b0
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.1.8 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.1.8
index 6a3b39920206..f7dce10028ce 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.1.8
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl dev-haskell/parsec >=dev-haskell/regex-base-0.93.1 >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-tdfa/1.1.8/regex-tdfa-1.1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6f927a24f62f9faa1850c346e0317466
diff --git a/metadata/md5-cache/dev-haskell/resource-pool-0.2.1.1 b/metadata/md5-cache/dev-haskell/resource-pool-0.2.1.1
index 7f70a2a858fe..39ccda5c8417 100644
--- a/metadata/md5-cache/dev-haskell/resource-pool-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/resource-pool-0.2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.1
 SRC_URI=mirror://hackage/packages/archive/resource-pool/0.2.1.1/resource-pool-0.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d168fdc9aea5dcd419be231b17a729a
diff --git a/metadata/md5-cache/dev-haskell/resourcet-0.4.7.2 b/metadata/md5-cache/dev-haskell/resourcet-0.4.7.2
index 93199f88caad..035332f33007 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-0.4.7.2
+++ b/metadata/md5-cache/dev-haskell/resourcet-0.4.7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.4.7.2
 SRC_URI=mirror://hackage/packages/archive/resourcet/0.4.7.2/resourcet-0.4.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6a8a659ffa70240f5f4f0e8bdce52c79
diff --git a/metadata/md5-cache/dev-haskell/resourcet-0.4.8 b/metadata/md5-cache/dev-haskell/resourcet-0.4.8
index 31adeeb6f1a6..0e121625d36f 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-0.4.8
+++ b/metadata/md5-cache/dev-haskell/resourcet-0.4.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.4.8
 SRC_URI=mirror://hackage/packages/archive/resourcet/0.4.8/resourcet-0.4.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=84778cba435e4ac60a932e297c2c3b3a
diff --git a/metadata/md5-cache/dev-haskell/resourcet-0.4.9 b/metadata/md5-cache/dev-haskell/resourcet-0.4.9
index 4d796ad4fa00..e13b32f36621 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-0.4.9
+++ b/metadata/md5-cache/dev-haskell/resourcet-0.4.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lifted-base-0.1:=[profile?] dev-haskell/mmorph:=[profile?] >=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.4.9
 SRC_URI=mirror://hackage/packages/archive/resourcet/0.4.9/resourcet-0.4.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a4fa2920e4d9d4f277135bc6c6f80205
diff --git a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.3 b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.3
index 5349bc8d9c95..ca29767e3956 100644
--- a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.0.1:=
 SLOT=0/0.1.0.3
 SRC_URI=mirror://hackage/packages/archive/rfc5051/0.1.0.3/rfc5051-0.1.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa490d4a203eac90a06f0b70d9dbb2f0
diff --git a/metadata/md5-cache/dev-haskell/safe-0.3.3-r1 b/metadata/md5-cache/dev-haskell/safe-0.3.3-r1
index 41e21eb8d379..a625e328dab7 100644
--- a/metadata/md5-cache/dev-haskell/safe-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/safe-0.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/safe/0.3.3/safe-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3f6c1f1ad427c1bf679558ec13dc32b4
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.9.0 b/metadata/md5-cache/dev-haskell/safesemaphore-0.9.0
index 7c5460ad1c04..0dca66d0f2ad 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.9.0
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.9.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.0
 SRC_URI=mirror://hackage/packages/archive/SafeSemaphore/0.9.0/SafeSemaphore-0.9.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9c29f6c96cafb41537451d97954dc157
diff --git a/metadata/md5-cache/dev-haskell/securemem-0.1.3 b/metadata/md5-cache/dev-haskell/securemem-0.1.3
index 49b89b85ed2f..690b30e3cbe1 100644
--- a/metadata/md5-cache/dev-haskell/securemem-0.1.3
+++ b/metadata/md5-cache/dev-haskell/securemem-0.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/securemem/0.1.3/securemem-0.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=34e436d2e9518f8ec76eae9bf5a59a44
diff --git a/metadata/md5-cache/dev-haskell/semigroupoid-extras-3.0.1 b/metadata/md5-cache/dev-haskell/semigroupoid-extras-3.0.1
index 3d3a99169054..225a01e32ff1 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoid-extras-3.0.1
+++ b/metadata/md5-cache/dev-haskell/semigroupoid-extras-3.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] >=dev-haskell/groupoids-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.0.1
 SRC_URI=mirror://hackage/packages/archive/semigroupoid-extras/3.0.1/semigroupoid-extras-3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fbeb8ce558565c00b25c011e6c33f198
diff --git a/metadata/md5-cache/dev-haskell/semigroupoid-extras-4.0 b/metadata/md5-cache/dev-haskell/semigroupoid-extras-4.0
index 00a33574c19d..8fd664c23858 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoid-extras-4.0
+++ b/metadata/md5-cache/dev-haskell/semigroupoid-extras-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/semigroupoid-extras/4.0/semigroupoid-extras-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c881088a1039fb855cfe22b6efbbc91f
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-3.1 b/metadata/md5-cache/dev-haskell/semigroupoids-3.1
index 73166d7e4dd3..2627b32c766c 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-3.1
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/comonad-4:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/3.1
 SRC_URI=mirror://hackage/packages/archive/semigroupoids/3.1/semigroupoids-3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c429b6fc356aa1f35674d603ec4f1eb6
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-4.0 b/metadata/md5-cache/dev-haskell/semigroupoids-4.0
index 92e649afa196..d9fb775667c9 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-4.0
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/4.0
 SRC_URI=mirror://hackage/packages/archive/semigroupoids/4.0/semigroupoids-4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=81a25b68c9ba4375922eeb4e4880acad
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.11 b/metadata/md5-cache/dev-haskell/semigroups-0.11
index b2ca3929f609..dc3ea864ed8c 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.11
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.11
 SRC_URI=mirror://hackage/packages/archive/semigroups/0.11/semigroups-0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3192e97d3647383d97bc54d58b9178ce
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.12.1 b/metadata/md5-cache/dev-haskell/semigroups-0.12.1
index 484e13695b84..c9a854de5cc6 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.12.1
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.12.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.12.1
 SRC_URI=mirror://hackage/packages/archive/semigroups/0.12.1/semigroups-0.12.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4353cdcc2a88989d8292b7f4ac01667e
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.9.2 b/metadata/md5-cache/dev-haskell/semigroups-0.9.2
index 1263a004a6d3..ae16ea4e010f 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.9.2
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/nats-0.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.9.2
 SRC_URI=mirror://hackage/packages/archive/semigroups/0.9.2/semigroups-0.9.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9899e8aa78ba7b5448ec055875e8ad1a
diff --git a/metadata/md5-cache/dev-haskell/sendfile-0.7.9 b/metadata/md5-cache/dev-haskell/sendfile-0.7.9
index 0011d111bdce..bc98f48235af 100644
--- a/metadata/md5-cache/dev-haskell/sendfile-0.7.9
+++ b/metadata/md5-cache/dev-haskell/sendfile-0.7.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/network-2*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.9
 SRC_URI=mirror://hackage/packages/archive/sendfile/0.7.9/sendfile-0.7.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=29a442ea7bdc33a310c5c4e41a9e3964
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.0 b/metadata/md5-cache/dev-haskell/setenv-0.1.0
index 5ace50e632d0..301ce8d748dc 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.0
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.1.0
 SRC_URI=mirror://hackage/packages/archive/setenv/0.1.0/setenv-0.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=85905849224066658803ed4c7d53898c
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.1 b/metadata/md5-cache/dev-haskell/setenv-0.1.1
index fee4d13711ca..344184d998d0 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.1
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/setenv/0.1.1/setenv-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2b984cf77cb9b96570268f7df072b3d2
diff --git a/metadata/md5-cache/dev-haskell/sha-1.5.0.0 b/metadata/md5-cache/dev-haskell/sha-1.5.0.0
index 22e75189132f..c8ffef6a8781 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.5.0.0
+++ b/metadata/md5-cache/dev-haskell/sha-1.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/SHA/1.5.0.0/SHA-1.5.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=436f3ed74a6a85a9372650a505164ee1
diff --git a/metadata/md5-cache/dev-haskell/sha-1.6.0 b/metadata/md5-cache/dev-haskell/sha-1.6.0
index 3187d2f484e3..a93bdd98af80 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.6.0
+++ b/metadata/md5-cache/dev-haskell/sha-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.6.0
 SRC_URI=mirror://hackage/packages/archive/SHA/1.6.0/SHA-1.6.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=89d2162a26d1b934dcbe5c5f55560c59
diff --git a/metadata/md5-cache/dev-haskell/sha-1.6.1 b/metadata/md5-cache/dev-haskell/sha-1.6.1
index 3bd236939706..46f3029e8f17 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.6.1
+++ b/metadata/md5-cache/dev-haskell/sha-1.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.6.1
 SRC_URI=mirror://hackage/packages/archive/SHA/1.6.1/SHA-1.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dd06f91f0d365ed51d973528beb0d1fb
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-1.0.5.1 b/metadata/md5-cache/dev-haskell/shakespeare-1.0.5.1
index 6f59195beca9..bc367cd86145 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-1.0.5.1
+++ b/metadata/md5-cache/dev-haskell/shakespeare-1.0.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.0.5.1
 SRC_URI=mirror://hackage/packages/archive/shakespeare/1.0.5.1/shakespeare-1.0.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2957cd7c1ab57074ef6814ecbc8e8fcf
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-1.2.0 b/metadata/md5-cache/dev-haskell/shakespeare-1.2.0
index 005b08ab27a2..9b8e068aa8b9 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-1.2.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/shakespeare/1.2.0/shakespeare-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f7bbc2b4e68f08aae69ca73199efde59
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-1.2.0.3 b/metadata/md5-cache/dev-haskell/shakespeare-1.2.0.3
index 8818f5de7f13..81d9be6be4a7 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-1.2.0.3
+++ b/metadata/md5-cache/dev-haskell/shakespeare-1.2.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.0.3
 SRC_URI=mirror://hackage/packages/archive/shakespeare/1.2.0.3/shakespeare-1.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e8818f34a43641d6f87dd164c2f4f44d
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.2 b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.2
index 54a1bc62b35d..097cd39d0601 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.2
+++ b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] >=dev-haskell/text-0.11.1.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.6.2
 SRC_URI=mirror://hackage/packages/archive/shakespeare-css/1.0.6.2/shakespeare-css-1.0.6.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d9b3764c4c8515bdee736ad9286dc2e3
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.3 b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.3
index ba4c2253a1d8..c702a2200118 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.3
+++ b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.11.1.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.6.3
 SRC_URI=mirror://hackage/packages/archive/shakespeare-css/1.0.6.3/shakespeare-css-1.0.6.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5a1b31e4c0c8507e4782e033c53f6866
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.6 b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.6
index 5c526d62fdfd..6b3c835b5677 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.6
+++ b/metadata/md5-cache/dev-haskell/shakespeare-css-1.0.6.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.11.1.1:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.6.6
 SRC_URI=mirror://hackage/packages/archive/shakespeare-css/1.0.6.6/shakespeare-css-1.0.6.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e7ed7a8cfbe9c2517af1f20d67970410
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.3 b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.3
index 4dcda01cacf5..5b9b253a0f44 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.3
+++ b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/parsec:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.3
 SRC_URI=mirror://hackage/packages/archive/shakespeare-i18n/1.0.0.3/shakespeare-i18n-1.0.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=14ac1adf3869765ee73afb2d4289b14e
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.4 b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.4
index a25a6ff38a25..a1a73d1d3d88 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.4
+++ b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.4
 SRC_URI=mirror://hackage/packages/archive/shakespeare-i18n/1.0.0.4/shakespeare-i18n-1.0.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=56d99d289c5d10ef1a90c75913fd4533
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.5 b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.5
index aacb395e3999..d7a0758af06c 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.5
+++ b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.0.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.5
 SRC_URI=mirror://hackage/packages/archive/shakespeare-i18n/1.0.0.5/shakespeare-i18n-1.0.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e78bee35b5a7354f182d0901e827c812
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.1.4.1 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.1.4.1
index 9566c63afa92..087fe0af82d8 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.1.4.1
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.0.5:=[profile?] <dev-haskell/shakespeare-1.1:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.4.1
 SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.1.4.1/shakespeare-js-1.1.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6e6f4c0e3d589eaeeed83f900f4ab863
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0
index 0a170c88ee47..591289f12f67 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.2.0/shakespeare-js-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c3cff7a7e60e4a74eb343470fc79b9c1
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.2 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.2
index 9e3dcd0016a7..5aa601337ff3 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.2
 SRC_URI=mirror://hackage/packages/archive/shakespeare-js/1.2.0.2/shakespeare-js-1.2.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b37df93647728002f320a06dd62a0e6e
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.10 b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.10
index ad55458cc066..1dcd5e108880 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.10
+++ b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.10
 SRC_URI=mirror://hackage/packages/archive/shakespeare-text/1.0.0.10/shakespeare-text-1.0.0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b3813b8a6002ee4b1555abeee6750409
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.6 b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.6
index 875000b40d88..d31a75fb28fe 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.6
+++ b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/shakespeare-1.0*:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.6
 SRC_URI=mirror://hackage/packages/archive/shakespeare-text/1.0.0.6/shakespeare-text-1.0.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd3decaa297e6950e95f159bbaaf2b6f
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.7 b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.7
index 4c663b6e8360..c86709239029 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/shakespeare-text-1.0.0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.7
 SRC_URI=mirror://hackage/packages/archive/shakespeare-text/1.0.0.7/shakespeare-text-1.0.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bf98d32a600601c3f2323b0632135d2c
diff --git a/metadata/md5-cache/dev-haskell/shellish-0.1.4 b/metadata/md5-cache/dev-haskell/shellish-0.1.4
index ad669a724cfe..6c8d7e8175bf 100644
--- a/metadata/md5-cache/dev-haskell/shellish-0.1.4
+++ b/metadata/md5-cache/dev-haskell/shellish-0.1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] dev-haskell/strict[profile?] dev-haskell/unix-compat[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/shellish/0.1.4/shellish-0.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=036d68891a039ace56a536f56dee5edd
diff --git a/metadata/md5-cache/dev-haskell/silently-1.2.4.1 b/metadata/md5-cache/dev-haskell/silently-1.2.4.1
index 20cebe16c092..7c80c77a5534 100644
--- a/metadata/md5-cache/dev-haskell/silently-1.2.4.1
+++ b/metadata/md5-cache/dev-haskell/silently-1.2.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.4.1
 SRC_URI=mirror://hackage/packages/archive/silently/1.2.4.1/silently-1.2.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=724c9bb27f91eec31c462253811c03e5
diff --git a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.1 b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.1
index 6b9cc45651e0..e5cb890b7862 100644
--- a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.1
+++ b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/simple-reflect/0.3.1/simple-reflect-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d6a896fb53327ec567d32d4dae0002c8
diff --git a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.12 b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.12
index af8f699da0e6..d158710e743a 100644
--- a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.12
+++ b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.2.12
 SRC_URI=mirror://hackage/packages/archive/simple-sendfile/0.2.12/simple-sendfile-0.2.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bfb027693de1b3a10134e339e711ae4f
diff --git a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.13 b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.13
index 03d9dc8ccbd4..a48701145ccc 100644
--- a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.13
+++ b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.13
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.2.13
 SRC_URI=mirror://hackage/packages/archive/simple-sendfile/0.2.13/simple-sendfile-0.2.13.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da01c89f42de3dd1d81d843d32ff07d7
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.3 b/metadata/md5-cache/dev-haskell/skein-1.0.3
index 3b3683788e6a..8b4ea8386319 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.3
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/cereal-0.3*:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.3
 SRC_URI=mirror://hackage/packages/archive/skein/1.0.3/skein-1.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=14dcf70cc0265d15c751a39066b63886
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.6-r1 b/metadata/md5-cache/dev-haskell/skein-1.0.6-r1
index 3f68766e6293..b2c6db5c9fe2 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.6-r1
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.6
 SRC_URI=mirror://hackage/packages/archive/skein/1.0.6/skein-1.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=91e4937a26ed85e734a868491257f255
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.8 b/metadata/md5-cache/dev-haskell/skein-1.0.8
index a69db0a30112..0f6675a4e736 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.8
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.8
 SRC_URI=mirror://hackage/packages/archive/skein/1.0.8/skein-1.0.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7b8345d728a4366fd775e785d6b130dd
diff --git a/metadata/md5-cache/dev-haskell/smallcheck-1.0.4 b/metadata/md5-cache/dev-haskell/smallcheck-1.0.4
index 00091b91940d..fa05f40ab3d2 100644
--- a/metadata/md5-cache/dev-haskell/smallcheck-1.0.4
+++ b/metadata/md5-cache/dev-haskell/smallcheck-1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.0.4
 SRC_URI=mirror://hackage/packages/archive/smallcheck/1.0.4/smallcheck-1.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bbbd314d1055c396d4ddcc9b19fb0921
diff --git a/metadata/md5-cache/dev-haskell/snap-core-0.9.5.0 b/metadata/md5-cache/dev-haskell/snap-core-0.9.5.0
index 0bcc91673a0c..7e3c79481c76 100644
--- a/metadata/md5-cache/dev-haskell/snap-core-0.9.5.0
+++ b/metadata/md5-cache/dev-haskell/snap-core-0.9.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] >=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?] >=dev-lang/ghc-6.12.1:= !portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?] ) || ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
 SLOT=0/0.9.5.0
 SRC_URI=mirror://hackage/packages/archive/snap-core/0.9.5.0/snap-core-0.9.5.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=14c8fbc6276fcfae6ddde7496d1e274c
diff --git a/metadata/md5-cache/dev-haskell/snap-server-0.9.3.4 b/metadata/md5-cache/dev-haskell/snap-server-0.9.3.4
index 4e8bf67af909..bf0c853e4d33 100644
--- a/metadata/md5-cache/dev-haskell/snap-server-0.9.3.4
+++ b/metadata/md5-cache/dev-haskell/snap-server-0.9.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.2:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.5:=[profile?] >=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-6.12.1:= openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.11:=[profile?] )
 SLOT=0/0.9.3.4
 SRC_URI=mirror://hackage/packages/archive/snap-server/0.9.3.4/snap-server-0.9.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=184542a5121b42b7b0196f5e4c3ad072
diff --git a/metadata/md5-cache/dev-haskell/socks-0.5.1 b/metadata/md5-cache/dev-haskell/socks-0.5.1
index 9f76872566d6..426981cca0a4 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.5.1
+++ b/metadata/md5-cache/dev-haskell/socks-0.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1
 SRC_URI=mirror://hackage/packages/archive/socks/0.5.1/socks-0.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=56002fa2300829b5b1d1360230054520
diff --git a/metadata/md5-cache/dev-haskell/socks-0.5.3 b/metadata/md5-cache/dev-haskell/socks-0.5.3
index eabfd0cdbe87..d73f1e7e2858 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.5.3
+++ b/metadata/md5-cache/dev-haskell/socks-0.5.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.3
 SRC_URI=mirror://hackage/packages/archive/socks/0.5.3/socks-0.5.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=44fe256203c92dab5abd3ff1d7a56c9e
diff --git a/metadata/md5-cache/dev-haskell/socks-0.5.4 b/metadata/md5-cache/dev-haskell/socks-0.5.4
index 1a48fcfd082a..c7805844e7a5 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.5.4
+++ b/metadata/md5-cache/dev-haskell/socks-0.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.4
 SRC_URI=mirror://hackage/packages/archive/socks/0.5.4/socks-0.5.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=170ff4651d88ae55d81b4471c645f5c0
diff --git a/metadata/md5-cache/dev-haskell/split-0.1.4.2 b/metadata/md5-cache/dev-haskell/split-0.1.4.2
index d468fdf155df..3c9d9d259e58 100644
--- a/metadata/md5-cache/dev-haskell/split-0.1.4.2
+++ b/metadata/md5-cache/dev-haskell/split-0.1.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/split/0.1.4.2/split-0.1.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d1ebb918609c6e52007f55cd80c1ed9
diff --git a/metadata/md5-cache/dev-haskell/split-0.1.4.3 b/metadata/md5-cache/dev-haskell/split-0.1.4.3
index c611f47db6e9..847292ed708e 100644
--- a/metadata/md5-cache/dev-haskell/split-0.1.4.3
+++ b/metadata/md5-cache/dev-haskell/split-0.1.4.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/split/0.1.4.3/split-0.1.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=87e051cd28288978147e8a53530f53d2
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.1.1 b/metadata/md5-cache/dev-haskell/split-0.2.1.1
index bd1076fc58c4..5c2f2ef8b24b 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/split-0.2.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.1
 SRC_URI=mirror://hackage/packages/archive/split/0.2.1.1/split-0.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=413e6266cd015370dd801880e8275791
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.1.3 b/metadata/md5-cache/dev-haskell/split-0.2.1.3
index 762d8fbf5b92..dac99fa82742 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.1.3
+++ b/metadata/md5-cache/dev-haskell/split-0.2.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.3
 SRC_URI=mirror://hackage/packages/archive/split/0.2.1.3/split-0.2.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0fa83cc50d13ecd73053000f58cb9399
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.2 b/metadata/md5-cache/dev-haskell/split-0.2.2
index ab2698c3d4d3..9f1bed881204 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.2
+++ b/metadata/md5-cache/dev-haskell/split-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/split/0.2.2/split-0.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f44bb6b042748bd8a89b0a2b3c23abfd
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.0.0.0 b/metadata/md5-cache/dev-haskell/statevar-1.0.0.0
index c7ab5908a977..d0fe6019e17d 100644
--- a/metadata/md5-cache/dev-haskell/statevar-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/statevar-1.0.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/StateVar/1.0.0.0/StateVar-1.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=93efcccfd3910ffe99e3f3293991e626
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.0.0.0-r1 b/metadata/md5-cache/dev-haskell/statevar-1.0.0.0-r1
index 179a472b2d53..a7a46423384c 100644
--- a/metadata/md5-cache/dev-haskell/statevar-1.0.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/statevar-1.0.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0.0
 SRC_URI=mirror://hackage/packages/archive/StateVar/1.0.0.0/StateVar-1.0.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0afc5155441bf2c720e88ac7af805a96
diff --git a/metadata/md5-cache/dev-haskell/statistics-0.10.4.1 b/metadata/md5-cache/dev-haskell/statistics-0.10.4.1
index c3fc1b6e9020..18fb49b08c87 100644
--- a/metadata/md5-cache/dev-haskell/statistics-0.10.4.1
+++ b/metadata/md5-cache/dev-haskell/statistics-0.10.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-0.6.3.0:=[profile?] >=dev-haskell/deepseq-1.1.0.2:=
 RESTRICT=test
 SLOT=0/0.10.4.1
 SRC_URI=mirror://hackage/packages/archive/statistics/0.10.4.1/statistics-0.10.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=27e3d49be977cfac39e8515849cdf2e2
diff --git a/metadata/md5-cache/dev-haskell/stm-2.1.2.2 b/metadata/md5-cache/dev-haskell/stm-2.1.2.2
index 9beb0e09afeb..cbad2fa17566 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.1.2.2
+++ b/metadata/md5-cache/dev-haskell/stm-2.1.2.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/stm/2.1.2.2/stm-2.1.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8035215a0fd41902044e75394cf1daa5
diff --git a/metadata/md5-cache/dev-haskell/stm-2.3 b/metadata/md5-cache/dev-haskell/stm-2.3
index 89012ba8bc28..58fc4716803e 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.3
+++ b/metadata/md5-cache/dev-haskell/stm-2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/stm/2.3/stm-2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6dcee6a16e28f3c2387531e87e4e3ebd
diff --git a/metadata/md5-cache/dev-haskell/stm-2.4.2 b/metadata/md5-cache/dev-haskell/stm-2.4.2
index f3e402b2830b..81a8c1d060c8 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.4.2
+++ b/metadata/md5-cache/dev-haskell/stm-2.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.2
 SRC_URI=mirror://hackage/packages/archive/stm/2.4.2/stm-2.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8713d04a44380c8682acd81f9936c5c0
diff --git a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0 b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0
index e0eb9f188701..b27891946075 100644
--- a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0
+++ b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.0.0
 SRC_URI=mirror://hackage/packages/archive/stm-chans/3.0.0/stm-chans-3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=813324bbf2fed4607b0ce20426b025e3
diff --git a/metadata/md5-cache/dev-haskell/stream-0.2.6-r1 b/metadata/md5-cache/dev-haskell/stream-0.2.6-r1
index 1b0ada6f8232..8ee236220562 100644
--- a/metadata/md5-cache/dev-haskell/stream-0.2.6-r1
+++ b/metadata/md5-cache/dev-haskell/stream-0.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/quickcheck:1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Stream/0.2.6/Stream-0.2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7d3a8ed4c8d7de31c294dc96e930aa25
diff --git a/metadata/md5-cache/dev-haskell/stream-0.4.6 b/metadata/md5-cache/dev-haskell/stream-0.4.6
index 849ee6f66a2f..14ae19760688 100644
--- a/metadata/md5-cache/dev-haskell/stream-0.4.6
+++ b/metadata/md5-cache/dev-haskell/stream-0.4.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lazysmallcheck-0.3[profile?] >=dev-haskell/quickcheck-2.0[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Stream/0.4.6/Stream-0.4.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=863b9030d8220906e62e48106e9c6715
diff --git a/metadata/md5-cache/dev-haskell/stream-0.4.6.1 b/metadata/md5-cache/dev-haskell/stream-0.4.6.1
index 056704e6ba84..a22531d0e312 100644
--- a/metadata/md5-cache/dev-haskell/stream-0.4.6.1
+++ b/metadata/md5-cache/dev-haskell/stream-0.4.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.6.1
 SRC_URI=mirror://hackage/packages/archive/Stream/0.4.6.1/Stream-0.4.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=da122359eb762211bc9c9deff525ad95
diff --git a/metadata/md5-cache/dev-haskell/strict-0.3.2 b/metadata/md5-cache/dev-haskell/strict-0.3.2
index 64c8afd4bd35..e8676e951bcb 100644
--- a/metadata/md5-cache/dev-haskell/strict-0.3.2
+++ b/metadata/md5-cache/dev-haskell/strict-0.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/strict/0.3.2/strict-0.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4fd69d37045a052272a309025869fe35
diff --git a/metadata/md5-cache/dev-haskell/stringable-0.1.2 b/metadata/md5-cache/dev-haskell/stringable-0.1.2
index 40784e398ca4..416fb765c820 100644
--- a/metadata/md5-cache/dev-haskell/stringable-0.1.2
+++ b/metadata/md5-cache/dev-haskell/stringable-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/stringable/0.1.2/stringable-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6f57c61024fb3fa7124134f594c4cb11
diff --git a/metadata/md5-cache/dev-haskell/stringbuilder-0.4.0 b/metadata/md5-cache/dev-haskell/stringbuilder-0.4.0
index 267cecb4190d..1f09e4008f35 100644
--- a/metadata/md5-cache/dev-haskell/stringbuilder-0.4.0
+++ b/metadata/md5-cache/dev-haskell/stringbuilder-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0
 SRC_URI=mirror://hackage/packages/archive/stringbuilder/0.4.0/stringbuilder-0.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7dde97f42116f689fee66093083f97bf
diff --git a/metadata/md5-cache/dev-haskell/stringprep-0.1.5 b/metadata/md5-cache/dev-haskell/stringprep-0.1.5
index 4752a706b028..e0dc1b88a13a 100644
--- a/metadata/md5-cache/dev-haskell/stringprep-0.1.5
+++ b/metadata/md5-cache/dev-haskell/stringprep-0.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ranges-0.2.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.5
 SRC_URI=mirror://hackage/packages/archive/stringprep/0.1.5/stringprep-0.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c988906370c7f78cb325a2dc32f82553
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.4 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.4
index 72f6b1b1f4f0..91bbc4027ceb 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.4
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.4/stringsearch-0.3.6.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea438df01e0152418f36af18b8bce279
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
index 60afe4343d16..73f31967c403 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.6.5
 SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.5/stringsearch-0.3.6.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5928ddb2a790fc24f93b6c5a7b77f6cb
diff --git a/metadata/md5-cache/dev-haskell/syb-0.3.2 b/metadata/md5-cache/dev-haskell/syb-0.3.2
index e360600bd840..cfd045a952d9 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.3.2
+++ b/metadata/md5-cache/dev-haskell/syb-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/syb/0.3.2/syb-0.3.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7fa1941e44302acb3b544a9a0bced918
diff --git a/metadata/md5-cache/dev-haskell/syb-0.3.6 b/metadata/md5-cache/dev-haskell/syb-0.3.6
index 45dddd7d5e35..d295837439df 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.3.6
+++ b/metadata/md5-cache/dev-haskell/syb-0.3.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/syb/0.3.6/syb-0.3.6.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2e36de2b60afed1e3c2133b924fddbab
diff --git a/metadata/md5-cache/dev-haskell/syb-0.3.6.1 b/metadata/md5-cache/dev-haskell/syb-0.3.6.1
index 12d0ed8f3686..3f59c8d4253c 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.3.6.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.3.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/syb/0.3.6.1/syb-0.3.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a592484ef973e9630e523fb464fb578f
diff --git a/metadata/md5-cache/dev-haskell/syb-0.3.7 b/metadata/md5-cache/dev-haskell/syb-0.3.7
index 833938d95d45..acc68394cbee 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.3.7
+++ b/metadata/md5-cache/dev-haskell/syb-0.3.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/syb/0.3.7/syb-0.3.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8be7453e8a7a2850179675fff2d7de19
diff --git a/metadata/md5-cache/dev-haskell/syb-0.4.0 b/metadata/md5-cache/dev-haskell/syb-0.4.0
index 765150a603d5..f5059f8ed994 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.4.0
+++ b/metadata/md5-cache/dev-haskell/syb-0.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0
 SRC_URI=mirror://hackage/packages/archive/syb/0.4.0/syb-0.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c47cc1ab61734fb0a508e07475a28c6d
diff --git a/metadata/md5-cache/dev-haskell/syb-0.4.1 b/metadata/md5-cache/dev-haskell/syb-0.4.1
index af389c65c4eb..7d7c683e182f 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.4.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1
 SRC_URI=mirror://hackage/packages/archive/syb/0.4.1/syb-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=53c0d3683d84036700125f170ad9c49a
diff --git a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.4-r1 b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.4-r1
index 52dab8082118..44284b2face3 100644
--- a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.4-r1
+++ b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.1.4
 SRC_URI=mirror://hackage/packages/archive/syb-with-class/0.6.1.4/syb-with-class-0.6.1.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=985c5e99b37ace6217873475425e4f2d
diff --git a/metadata/md5-cache/dev-haskell/system-fileio-0.3.11 b/metadata/md5-cache/dev-haskell/system-fileio-0.3.11
index 343f95ffd1a8..cf81b13f6c61 100644
--- a/metadata/md5-cache/dev-haskell/system-fileio-0.3.11
+++ b/metadata/md5-cache/dev-haskell/system-fileio-0.3.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.11
 SRC_URI=mirror://hackage/packages/archive/system-fileio/0.3.11/system-fileio-0.3.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1db7b5522b771ec8a358eb4f687da336
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.7-r1 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.7-r1
index ae06f75731bc..4af946533378 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.7-r1
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.7-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.7
 SRC_URI=mirror://hackage/packages/archive/system-filepath/0.4.7/system-filepath-0.4.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6f0ef55e554c32eff302cb6d15cdefbd
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.8 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.8
index f487918f181b..1c48c4a1f2ea 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.8
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.8
 SRC_URI=mirror://hackage/packages/archive/system-filepath/0.4.8/system-filepath-0.4.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e8a5c41f24a116517168e4790732de49
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.6.1 b/metadata/md5-cache/dev-haskell/tagged-0.6.1
index 0fd32ddbe302..b77ebcecfdb2 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.6.1
+++ b/metadata/md5-cache/dev-haskell/tagged-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1
 SRC_URI=mirror://hackage/packages/archive/tagged/0.6.1/tagged-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cd4a6fb8f874cd0d87953b79a25d3bc2
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.7 b/metadata/md5-cache/dev-haskell/tagged-0.7
index 9a96661b1983..782559a2cd59 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.7
+++ b/metadata/md5-cache/dev-haskell/tagged-0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7
 SRC_URI=mirror://hackage/packages/archive/tagged/0.7/tagged-0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=885119e1d9afe8fe5908e728a9d0fd28
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.12 b/metadata/md5-cache/dev-haskell/tagsoup-0.12
index 656af81851e8..d6983b6575ef 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.12
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/tagsoup/0.12/tagsoup-0.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=357f4f8985e73d5a23a216a336e4e755
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.12.6 b/metadata/md5-cache/dev-haskell/tagsoup-0.12.6
index 94d574121681..9454c2e3ce37 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.12.6
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.12.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/tagsoup/0.12.6/tagsoup-0.12.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0052135d3007fc3c29088286ff7155df
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.12.8 b/metadata/md5-cache/dev-haskell/tagsoup-0.12.8
index 380fcc462f7a..2702bde35f30 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.12.8
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.12.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.12.8
 SRC_URI=mirror://hackage/packages/archive/tagsoup/0.12.8/tagsoup-0.12.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=33246d80372f8e33e61ac8441d56d1a8
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.13 b/metadata/md5-cache/dev-haskell/tagsoup-0.13
index 391ec2c78f85..527f44484eec 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.13
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= download? ( dev-haskell/network:=[profile?] )
 SLOT=0/0.13
 SRC_URI=mirror://hackage/packages/archive/tagsoup/0.13/tagsoup-0.13.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=925a883b92455fc9d593c14840a7e04f
diff --git a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4 b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4
index a549a7ca067e..3abeb441b4d6 100644
--- a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4
+++ b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/attoparsec-conduit-0.5:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.4
 SRC_URI=mirror://hackage/packages/archive/tagstream-conduit/0.5.4/tagstream-conduit-0.5.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0725e2e49c03e94e29ce59d9b2d9ff34
diff --git a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4.1 b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4.1
index 411a99c65152..8bc157f0beea 100644
--- a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4.1
+++ b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/attoparsec-conduit-0.5:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.4.1
 SRC_URI=mirror://hackage/packages/archive/tagstream-conduit/0.5.4.1/tagstream-conduit-0.5.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7f2aec6dab061294c99c731318b32779
diff --git a/metadata/md5-cache/dev-haskell/tar-0.3.1.0 b/metadata/md5-cache/dev-haskell/tar-0.3.1.0
index 608f0ec334f7..08711c08e504 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.3.1.0
+++ b/metadata/md5-cache/dev-haskell/tar-0.3.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/tar/0.3.1.0/tar-0.3.1.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebab84ca0519c3eea09777163b490138
diff --git a/metadata/md5-cache/dev-haskell/tar-0.3.2.0 b/metadata/md5-cache/dev-haskell/tar-0.3.2.0
index bd170d2d04cd..1b9d41bc008f 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.3.2.0
+++ b/metadata/md5-cache/dev-haskell/tar-0.3.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/tar/0.3.2.0/tar-0.3.2.0.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05148b2c3b3099979faf279d4dce673c
diff --git a/metadata/md5-cache/dev-haskell/tar-0.4.0.1 b/metadata/md5-cache/dev-haskell/tar-0.4.0.1
index 0f3a454c6cb4..50c6fd234b9b 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/tar-0.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/tar/0.4.0.1/tar-0.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=004c036162969b92721a54e6a6f91be1
diff --git a/metadata/md5-cache/dev-haskell/tasty-0.2 b/metadata/md5-cache/dev-haskell/tasty-0.2
index 8e36459ada0e..aff7e798f7c4 100644
--- a/metadata/md5-cache/dev-haskell/tasty-0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.5:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-6.10.4:= colors? ( dev-haskell/ansi-terminal:=[profile?] )
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/tasty/0.2/tasty-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c79499c3e8f60db263639a490a692741
diff --git a/metadata/md5-cache/dev-haskell/tasty-0.3.1 b/metadata/md5-cache/dev-haskell/tasty-0.3.1
index 9910e0a63fa1..43e9aa057602 100644
--- a/metadata/md5-cache/dev-haskell/tasty-0.3.1
+++ b/metadata/md5-cache/dev-haskell/tasty-0.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-6.10.4:= colors? ( dev-haskell/ansi-terminal:=[profile?] )
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/tasty/0.3.1/tasty-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3b097c099bef6ac76cadf32dd884810d
diff --git a/metadata/md5-cache/dev-haskell/tasty-0.5.2 b/metadata/md5-cache/dev-haskell/tasty-0.5.2
index 978c6cc770d1..c06c4bbffcd7 100644
--- a/metadata/md5-cache/dev-haskell/tasty-0.5.2
+++ b/metadata/md5-cache/dev-haskell/tasty-0.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] dev-haskell/regex-posix:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= colors? ( dev-haskell/ansi-terminal:=[profile?] )
 SLOT=0/0.5.2
 SRC_URI=mirror://hackage/packages/archive/tasty/0.5.2/tasty-0.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=39d269c53ae5dd74337808c657e9c23f
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.2 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.2
index b6773a84d741..315f378f98fc 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.2/tasty-hunit-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3e0802cd70ad07b0d9415a9e10e91b8a
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.4.1 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.4.1
index 49b5f9c80f49..c567d6389569 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.4.1
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1
 SRC_URI=mirror://hackage/packages/archive/tasty-hunit/0.4.1/tasty-hunit-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a56c617a5036437b4929616b55e9a0d9
diff --git a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.3.1 b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.3.1
index 01f8ccbcf0f7..08272a4e65f9 100644
--- a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.3.1
+++ b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/quickcheck-2.5:=[profile?] <dev-haskell/quickcheck-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/tasty-quickcheck/0.3.1/tasty-quickcheck-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a2d1d415718b8dde19439853cf7f0db9
diff --git a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.2 b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.2
index 6e166b08cfa1..c0a1aea65bce 100644
--- a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/tasty-smallcheck/0.2/tasty-smallcheck-0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea74fa14c526e1b48d7efe2dcdc8d41d
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.1.2.3 b/metadata/md5-cache/dev-haskell/temporary-1.1.2.3
index 02c78ebc5d9a..78c156ec5061 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.1.2.3
+++ b/metadata/md5-cache/dev-haskell/temporary-1.1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/temporary/1.1.2.3/temporary-1.1.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3b8b416fff9fae676d069b6c6d170992
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.1.2.4 b/metadata/md5-cache/dev-haskell/temporary-1.1.2.4
index 4b8c7f30cb11..16aa0c6cebc6 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.1.2.4
+++ b/metadata/md5-cache/dev-haskell/temporary-1.1.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.2.4
 SRC_URI=mirror://hackage/packages/archive/temporary/1.1.2.4/temporary-1.1.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=66da4e4c5c566b2dd880a7d8376cc78f
diff --git a/metadata/md5-cache/dev-haskell/tensor-1.0.0.1 b/metadata/md5-cache/dev-haskell/tensor-1.0.0.1
index e1afad19eba5..5a30c7a9ba4b 100644
--- a/metadata/md5-cache/dev-haskell/tensor-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/tensor-1.0.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Tensor/1.0.0.1/Tensor-1.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3609c8ed4c921b4f405a69e064f9cb18
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3 b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
index 1fb403926503..b7d469a05626 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4 sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.3.2.3/terminfo-0.3.2.3.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f41fa044ca61dda405b2472bc833e9f2
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5 b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
index 08fc1ab385ac..c729ed79b50a 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.3.2.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/ncurses
 SLOT=0/0.3.2.5
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.3.2.5/terminfo-0.3.2.5.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=34ab7dee79fbd49a3bc5a877b59f5587
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-0.2.4
index 7add7f51fb5e..607c82fa35da 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.2.4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/ansi-terminal-0.4.0 >=dev-haskell/ansi-wl-pprint-0.4.0 >=dev-haskell/cabal-1.2.3 >=dev-haskell/regex-posix-0.72
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.2.4/test-framework-0.2.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d46dee7ab4c9049b0cc4088744c6c84e
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.4.2.0 b/metadata/md5-cache/dev-haskell/test-framework-0.4.2.0
index ed82171ccd79..b610e0052d17 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.4.2.0
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.4.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.4.2.0/test-framework-0.4.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=44cc25045e9b43f8d4eb3ef5d93d69bd
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.5 b/metadata/md5-cache/dev-haskell/test-framework-0.5
index a1dbd7177844..a163f7c573b9 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.5
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.5/test-framework-0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1c13d88c853288e66b24926e93562296
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.6 b/metadata/md5-cache/dev-haskell/test-framework-0.6
index 38fec5f26993..00a1f00a50fa 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.6
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/random-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.6/test-framework-0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3d773091e367d6a331f9074fe6a4e681
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.6.1 b/metadata/md5-cache/dev-haskell/test-framework-0.6.1
index ae3f280d079d..d4edb286668b 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.6.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] >=dev-haskell/extensible-exceptions-0.1.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.6.1/test-framework-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8963fbf2721ede516aecafef05d6d2bb
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8 b/metadata/md5-cache/dev-haskell/test-framework-0.8
index 54b99e354623..442268a543b6 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] >=dev-haskell/extensible-exceptions-0.1.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.8/test-framework-0.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=51dd20095f42f3b77fe8e9b5c8769d8e
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.0.3 b/metadata/md5-cache/dev-haskell/test-framework-0.8.0.3
index 344c6d9c5feb..fd277ad2d5b5 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.0.3
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-ppri
 RESTRICT=test
 SLOT=0/0.8.0.3
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.8.0.3/test-framework-0.8.0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=34b6ab5768c54789e21d5783d54e500b
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.4
index 339efa587e89..e94ffc2781ee 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/cabal-1.2.3 >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.2.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.2.4/test-framework-hunit-0.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f061a7a2da2e8f6c5248ac89821d2fe8
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.6 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.6
index 8e344b793cec..5c7fa6e3b3f5 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.6
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2 >=dev-haskell/test-framework-0.2.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.2.6/test-framework-hunit-0.2.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7dde3d19f9e53a2e927ee4c15e3c1944
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
index 460f10ba5337..4a5e91f585e7 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2[profile?] >=dev-haskell/test-framework-0.2.0[profile?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.2.7/test-framework-hunit-0.2.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6366ee1eb8fc72f65a37cf114f4bf54d
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
index d17a1f974f10..50b645acec63 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.3.0/test-framework-hunit-0.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5bc3587cf5c56f3c9b429ecd53fac768
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.1 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.1
index 085b4a1357fb..487ff20246a2 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.1
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.3.0.1/test-framework-hunit-0.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ee03e47d41ec222339b9f30383eeee75
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.10 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.10
index bd85d3a210af..a29eb4242c6a 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.10
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/quickcheck-2.4* <dev-haskell/test-framework-0.5.0 >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.10/test-framework-quickcheck2-0.2.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fdb38416dfdefc14cf1e9d491171e924
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1
index 3054c6251e2b..443bff02694f 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/quickcheck-2.4*[profile?] <dev-haskell/test-framework-0.6.0[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.12/test-framework-quickcheck2-0.2.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3bb474512c6fa1549d523e2eed380315
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.1
index 6df5d2fa30fe..21571b45cef8 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/quickcheck-2.4*[profile?] >=dev-haskell/test-framework-0.6[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.12.1/test-framework-quickcheck2-0.2.12.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=86d7158ae3fa6fa7cf29e813dc6a2f1d
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.2
index d3cc8e6e1a5f..c3a713728ce3 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/quickcheck-2.4*[profile?] >=dev-haskell/test-framework-0.6[profile?] >=dev-lang/ghc-6.10.4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.12.2/test-framework-quickcheck2-0.2.12.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=00db95993a1cde2490918158741dd0eb
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.3 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.3
index c48e8688112f..49fb806e2084 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.3
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.12.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.6:2=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.12.3
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.12.3/test-framework-quickcheck2-0.2.12.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f355836ff498b2a070b7483e2897a5bd
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.5 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.5
index 51e15a8a83fe..60f8e997851b 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.5
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.2.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/quickcheck-2.1.0.3 >=dev-haskell/test-framework-0.2.0
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.2.5/test-framework-quickcheck2-0.2.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=531347fa22e56e13dfc063bacc43ec0d
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.1-r1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.1-r1
index c11f105ad179..66b6264a762c 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.7.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.1
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.3.0.1/test-framework-quickcheck2-0.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c8f6290de402f7b5336ca9f8d8ab8f00
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
index 6beb7447e69f..cf249f084429 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.7.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.2
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.3.0.2/test-framework-quickcheck2-0.3.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=27a24a36bba48f8c9277c12d4f7fc208
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
index 0b41874aeeb2..341eb4918912 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=mirror://hackage/packages/archive/test-framework-th/0.2.4/test-framework-th-0.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=790add09f27bcc56117b73a2f4ad978e
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.5 b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.5
index 5532e2d2e083..a0de847b0b16 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.5
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cpphs-0.2.1[profile?] dev-haskell/haskell-src-exts[profile?] dev-haskell/test-framework[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-th-prime/0.0.5/test-framework-th-prime-0.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a76d9833df304ec02e465900f64b1402
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.6 b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.6
index 6f3a6dfd26ae..f63bb413b036 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.6
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.6
 SRC_URI=mirror://hackage/packages/archive/test-framework-th-prime/0.0.6/test-framework-th-prime-0.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=43609ceeb3fd5eddea440e31ad51dec9
diff --git a/metadata/md5-cache/dev-haskell/testpack-2.1.1 b/metadata/md5-cache/dev-haskell/testpack-2.1.1
index ad181b9694af..cfe0c3593f82 100644
--- a/metadata/md5-cache/dev-haskell/testpack-2.1.1
+++ b/metadata/md5-cache/dev-haskell/testpack-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/hunit dev-haskell/mtl >=dev-haskell/quickcheck-2.1.0.3 >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/testpack/2.1.1/testpack-2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d084d0e8cfa1d22b87cf23a6ad5ab37b
diff --git a/metadata/md5-cache/dev-haskell/testpack-2.1.2 b/metadata/md5-cache/dev-haskell/testpack-2.1.2
index 394a3486f77b..56b33e41ad46 100644
--- a/metadata/md5-cache/dev-haskell/testpack-2.1.2
+++ b/metadata/md5-cache/dev-haskell/testpack-2.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/hunit[profile?] dev-haskell/mtl[profile?] >=dev-haskell/quickcheck-2.1.0.3[profile?] dev-haskell/random[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/testpack/2.1.2/testpack-2.1.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ceca37ca55313dfd06e4aee07bd2a598
diff --git a/metadata/md5-cache/dev-haskell/testpack-2.1.2.1 b/metadata/md5-cache/dev-haskell/testpack-2.1.2.1
index 417e3620c002..45366daec97e 100644
--- a/metadata/md5-cache/dev-haskell/testpack-2.1.2.1
+++ b/metadata/md5-cache/dev-haskell/testpack-2.1.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.1.0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.2.1
 SRC_URI=mirror://hackage/packages/archive/testpack/2.1.2.1/testpack-2.1.2.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=007165fb4e444fd07af41dcb25e41b05
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.5.0.1 b/metadata/md5-cache/dev-haskell/texmath-0.5.0.1
index d5a891c68c6a..9a28ef05d93b 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/texmath-0.5.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-2 dev-haskell/syb dev-haskell/xml >=dev-lang/ghc-6.8.2 cgi? ( dev-haskell/json dev-haskell/cgi dev-haskell/utf8-string )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/texmath/0.5.0.1/texmath-0.5.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3f23b5f8431f9c55dc073ef9991eba93
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.0.3 b/metadata/md5-cache/dev-haskell/texmath-0.6.0.3
index e0ffd800cade..a50a6a24a35e 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.0.3
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-2[profile?] dev-haskell/syb[profile?] >=dev-haskell/xml-1.3.12[profile?] >=dev-lang/ghc-6.8.2 cgi? ( dev-haskell/json[profile?] dev-haskell/cgi[profile?] dev-haskell/utf8-string[profile?] )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.0.3/texmath-0.6.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6528b8c9e40443ff93bc7520425c7fdf
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.0.4 b/metadata/md5-cache/dev-haskell/texmath-0.6.0.4
index 6151f170b2a3..84ec5b7bc5bd 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.0.4
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-3[profile?] dev-haskell/syb[profile?] >=dev-haskell/xml-1.3.12[profile?] >=dev-lang/ghc-6.8.2 cgi? ( dev-haskell/json[profile?] dev-haskell/cgi[profile?] dev-haskell/utf8-string[profile?] )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.0.4/texmath-0.6.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b4bcc5bf2171483b75d88e879750a0aa
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.0.6 b/metadata/md5-cache/dev-haskell/texmath-0.6.0.6
index 79beb0cd9157..d4cca35e64c4 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.0.6
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-3[profile?] dev-haskell/syb[profile?] >=dev-haskell/xml-1.3.12[profile?] >=dev-lang/ghc-6.8.2 cgi? ( dev-haskell/json[profile?] dev-haskell/cgi[profile?] dev-haskell/utf8-string[profile?] )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.0.6/texmath-0.6.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d31774980d350f0a746bb667aeeaec1c
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.1.1 b/metadata/md5-cache/dev-haskell/texmath-0.6.1.1
index ba17efcfa7e1..7d25ac64703f 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/json:=[profile?] dev-haskell/cgi:=[profile?] dev-haskell/utf8-string:=[profile?] )
 SLOT=0/0.6.1.1
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.1.1/texmath-0.6.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d5a53479667bbe34cd0c4a839be8db84
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.1.3 b/metadata/md5-cache/dev-haskell/texmath-0.6.1.3
index 8e38938920a0..6941d458e80d 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.1.3
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/json:=[profile?] dev-haskell/cgi:=[profile?] dev-haskell/utf8-string:=[profile?] )
 SLOT=0/0.6.1.3
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.1.3/texmath-0.6.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b462e977c560c6918dbc81d4456714ae
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.1.5 b/metadata/md5-cache/dev-haskell/texmath-0.6.1.5
index b12ab09f5323..0425e285b24a 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.1.5
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
 SLOT=0/0.6.1.5
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.1.5/texmath-0.6.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0b40c9204f35a23d7adb7d230c8740e1
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.4 b/metadata/md5-cache/dev-haskell/texmath-0.6.4
index d17dec7c5fb2..bbecbc171cb1 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.4
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
 SLOT=0/0.6.4
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.4/texmath-0.6.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a18090aa4627c49a8ce1e16a8686aced
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.5.2 b/metadata/md5-cache/dev-haskell/texmath-0.6.5.2
index 31d0a24ef72c..0af710c3bdf8 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.5.2
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
 SLOT=0/0.6.5.2
 SRC_URI=mirror://hackage/packages/archive/texmath/0.6.5.2/texmath-0.6.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=71fcc9630b607e9619f8eb3d4d777d14
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.1.1 b/metadata/md5-cache/dev-haskell/text-0.11.1.1
index 3d6d9e5d6dd2..33e00d1b1dde 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.1.1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.1.1/text-0.11.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4078e2d320168a1581243acd5053fabe
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.1.12 b/metadata/md5-cache/dev-haskell/text-0.11.1.12
index 2b41ee48cfeb..19e1ab0946f5 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.1.12
+++ b/metadata/md5-cache/dev-haskell/text-0.11.1.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0 >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.1.12/text-0.11.1.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5fdf87fa79384a276ddd19fdf3136f1d
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.1.13-r1 b/metadata/md5-cache/dev-haskell/text-0.11.1.13-r1
index 1cfb23bbd7c2..8a6104ffeb66 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.1.13-r1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.1.13-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.1.13/text-0.11.1.13.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d4ba05d56c7ffce962f75ac8cf129a99
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.2.0 b/metadata/md5-cache/dev-haskell/text-0.11.2.0
index f32e9d8162ed..3ec77288cf56 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.2.0
+++ b/metadata/md5-cache/dev-haskell/text-0.11.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.2.0/text-0.11.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=49dab7f99dd67f19794a6233614ff574
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.2.1 b/metadata/md5-cache/dev-haskell/text-0.11.2.1
index a2988f6e3ab0..26a2980f8e3a 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.2.1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.2.1/text-0.11.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d5fb77c40fefa1528cff3f4551fae92a
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.2.2 b/metadata/md5-cache/dev-haskell/text-0.11.2.2
index 3c7c26b7e5a1..95c9b7e56662 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.2.2
+++ b/metadata/md5-cache/dev-haskell/text-0.11.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text/0.11.2.2/text-0.11.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0803f85c8c5d4b94f9f3ba07059558c8
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.2.3 b/metadata/md5-cache/dev-haskell/text-0.11.2.3
index 2dd2c2970e17..4adec82199cc 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.2.3
+++ b/metadata/md5-cache/dev-haskell/text-0.11.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.11.2.3
 SRC_URI=mirror://hackage/packages/archive/text/0.11.2.3/text-0.11.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3c59c2c95e01de37950d8902f35e884e
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.3.1 b/metadata/md5-cache/dev-haskell/text-0.11.3.1
index ade16bb3e31e..e28a7d18f901 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.3.1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11.3.1
 SRC_URI=mirror://hackage/packages/archive/text/0.11.3.1/text-0.11.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=914bb6b7ce94c5938243d35233d93780
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.5 b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.5
index 6e8711ae2475..fd599d2ae5e9 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.5
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9.1.0[profile?] <=dev-haskell/text-0.12.0.0[profile?] >=dev-lang/ghc-6.8.2 >=dev-libs/icu-4
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/text-icu/0.6.3.5/text-icu-0.6.3.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1483f7c00d7c77d704cdeae2e31a0590
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7 b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7
index 64e41103bf03..e5daf74bd639 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.6.3.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/icu
 SLOT=0/0.6.3.7
 SRC_URI=mirror://hackage/packages/archive/text-icu/0.6.3.7/text-icu-0.6.3.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab155ca028378f5a60804d09b000dbad
diff --git a/metadata/md5-cache/dev-haskell/threads-0.5.0.2 b/metadata/md5-cache/dev-haskell/threads-0.5.0.2
index 8d5a5e2bbac9..bffd90d73c59 100644
--- a/metadata/md5-cache/dev-haskell/threads-0.5.0.2
+++ b/metadata/md5-cache/dev-haskell/threads-0.5.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?] >=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.0.2
 SRC_URI=mirror://hackage/packages/archive/threads/0.5.0.2/threads-0.5.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4ed8114f81dd363975ba6676b6950efb
diff --git a/metadata/md5-cache/dev-haskell/time-compat-0.1.0.3 b/metadata/md5-cache/dev-haskell/time-compat-0.1.0.3
index 53bdc7342f02..1f76c1951e4a 100644
--- a/metadata/md5-cache/dev-haskell/time-compat-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/time-compat-0.1.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.0.3
 SRC_URI=mirror://hackage/packages/archive/time-compat/0.1.0.3/time-compat-0.1.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=25d3268f4b467b49fa3072384353a1af
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2 b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2
index e6535fa53fc8..c18b692fb76c 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1[profile?] <dev-haskell/binary-0.6[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/timezone-olson/0.1.2/timezone-olson-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=010f4377e8a0c0294012e3a2e3de48e7
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r1 b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r1
index dde07d46dc95..a52c4f97eeda 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.7:=[profile?] >=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/timezone-olson/0.1.2/timezone-olson-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e709b0ee254332b0527682a6fbffb901
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r2 b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r2
index 27d24247476e..e4d28918f44f 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r2
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2
 SRC_URI=mirror://hackage/packages/archive/timezone-olson/0.1.2/timezone-olson-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eca79d07d9691246706dca4f46b5012b
diff --git a/metadata/md5-cache/dev-haskell/timezone-series-0.1.2 b/metadata/md5-cache/dev-haskell/timezone-series-0.1.2
index 1e208b864964..bc2bf461ba93 100644
--- a/metadata/md5-cache/dev-haskell/timezone-series-0.1.2
+++ b/metadata/md5-cache/dev-haskell/timezone-series-0.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/timezone-series/0.1.2/timezone-series-0.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3047dbb7b7b66f6ac130c0a7dda7bb2c
diff --git a/metadata/md5-cache/dev-haskell/tls-1.1.2 b/metadata/md5-cache/dev-haskell/tls-1.1.2
index b708ad6628e6..afd0f90718e2 100644
--- a/metadata/md5-cache/dev-haskell/tls-1.1.2
+++ b/metadata/md5-cache/dev-haskell/tls-1.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/certificate-1.3.0:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] dev-haskell/crypto-pubkey:=[profile?] =dev-haskell/crypto-random-api-0.2*:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.2
 SRC_URI=mirror://hackage/packages/archive/tls/1.1.2/tls-1.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=152cbb49ca957ba436d1a53628a885a0
diff --git a/metadata/md5-cache/dev-haskell/tls-1.1.5 b/metadata/md5-cache/dev-haskell/tls-1.1.5
index e9da7954f091..52275f02e428 100644
--- a/metadata/md5-cache/dev-haskell/tls-1.1.5
+++ b/metadata/md5-cache/dev-haskell/tls-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/certificate-1.3.0:=[p
 RESTRICT=test
 SLOT=0/1.1.5
 SRC_URI=mirror://hackage/packages/archive/tls/1.1.5/tls-1.1.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5997b0e6ed47d1ba9181022cb591f33f
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.1 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.1
index 3cc7c56b8531..8a3062be38a8 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.1
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] =dev-haskell/cipher-aes-0.1*:=[profile?] dev-haskell/cipher-rc4:=[profile?] dev-haskell/crypto-pubkey:=[profile?] dev-haskell/crypto-random-api:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1.0:=[profile?] <dev-haskell/pem-0.2.0:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.1/tls-extra-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1b69cf0973293da79233d9c03f061508
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.3 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.3
index b1608f838118..3260ff64365f 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.3
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] =dev-haskell/cipher-aes-0.1*:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-pubkey-0.1.4:=[profile?] dev-haskell/crypto-random-api:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1.0:=[profile?] <dev-haskell/pem-0.2.0:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.6.3
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.3/tls-extra-0.6.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=75a716ec7c471553c7458d19ad522779
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.4 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.4
index 3dd8efb98c5d..ec3618f14e43 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.4
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4
 RESTRICT=test
 SLOT=0/0.6.4
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.4/tls-extra-0.6.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f36b7ac5c759b95721fa41ebea38c56
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.5 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.5
index e2f274a1acb5..67dfae026ea0 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.5
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4
 RESTRICT=test
 SLOT=0/0.6.5
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.5/tls-extra-0.6.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c01e7b7f814394f9ba80270016fa0152
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.5-r1 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.5-r1
index 6102a5c7259a..a78afbbb5c5e 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.5-r1
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4
 RESTRICT=test
 SLOT=0/0.6.5
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.5/tls-extra-0.6.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebcc92ac9c27dc4efe0a438af900647e
diff --git a/metadata/md5-cache/dev-haskell/tls-extra-0.6.6 b/metadata/md5-cache/dev-haskell/tls-extra-0.6.6
index 4c7a93ff25c0..232f1be59466 100644
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.6
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4
 RESTRICT=test
 SLOT=0/0.6.6
 SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.6/tls-extra-0.6.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=02cc15e55138fe75c09d3a898e135977
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.2.2.0 b/metadata/md5-cache/dev-haskell/transformers-0.2.2.0
index 53dc84c002ca..c8d0e7a1ef5d 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.2.2.0/transformers-0.2.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4bbbb26ca3232744d5be97f3e2efe558
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0 b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0
index b71a9d9c7b48..a18cbb891855 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.3.0.0/transformers-0.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5645d9189d29d29b8efc68a0062cf257
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1 b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
index 4cd54204f079..b08dc085bad1 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.3.0.0/transformers-0.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e76fb92aa55968f6402b14b9285838ae
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.1 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.1
index a66794477c25..baa9d7fc23fc 100644
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.1
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/transformers-base/0.4.1/transformers-base-0.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0b4800d7116b99234e557dea1dc9d4ed
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.1.1.1 b/metadata/md5-cache/dev-haskell/transformers-compat-0.1.1.1
index f198a2b1b7c6..9620a709d4d1 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.0.1:= =dev-haskell/transformers-0.3*:=[profile?]
 SLOT=0/0.1.1.1
 SRC_URI=mirror://hackage/packages/archive/transformers-compat/0.1.1.1/transformers-compat-0.1.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cfd3c6fbea0f234a9e08d1d734929b86
diff --git a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.0.5-r1 b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.0.5-r1
index 5d7165dd77f1..5e25aeb7478c 100644
--- a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.0.5
 SRC_URI=mirror://hackage/packages/archive/unbounded-delays/0.1.0.5/unbounded-delays-0.1.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5fcaddf4483b3fb6d415324b263d7c66
diff --git a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1 b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
index d1ae604fe5f7..cb3666ef5df4 100644
--- a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
+++ b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/uniqueid/0.1.1/uniqueid-0.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b9a447e04bce6f56609f1df58f076426
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1 b/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1
index f7c32a7526cb..94aad5c3feda 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.3.0.1/unix-compat-0.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=21e764f797bd908fe980a6f827845b14
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.4.0.0 b/metadata/md5-cache/dev-haskell/unix-compat-0.4.0.0
index 35d1d995d4ad..aa783b15ffeb 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.4.0.0
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.4.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.4.0.0
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.0.0/unix-compat-0.4.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e5dd2e6c0714594d29e2ba041e583aa2
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.0 b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.0
index e1b92f37da0d..e4fbca51407f 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.4.1.0
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.1.0/unix-compat-0.4.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=70e2ddb31f29d11b5b2fc6da5c0745f1
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.1 b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.1
index 1a021dd19692..675c82900988 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/0.4.1.1
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.1.1/unix-compat-0.4.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cfb6112f481a50d36c9305468de9fba5
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.2.0 b/metadata/md5-cache/dev-haskell/unix-time-0.2.0
index a46241474222..9a2fff69fa7e 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.2.0
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.0
 SRC_URI=mirror://hackage/packages/archive/unix-time/0.2.0/unix-time-0.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=751b18935e4e688089799435637e1418
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.2.1 b/metadata/md5-cache/dev-haskell/unix-time-0.2.1
index 00c7484077df..3d38ab0d8990 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.2.1
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1
 SRC_URI=mirror://hackage/packages/archive/unix-time/0.2.1/unix-time-0.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8db8fcb148935f53a1a52634d66318e7
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.2.2 b/metadata/md5-cache/dev-haskell/unix-time-0.2.2
index 54ba571425a2..533b191ef3ff 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.2.2
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/unix-time/0.2.2/unix-time-0.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dedf45d466fe37719170310887d29c7a
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.2.1 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.2.1
index a716d6e3768d..2b9bc5d2f6e8 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.2.1
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2.1
 SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.2.1/unordered-containers-0.2.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8ab56094b511eabec65e352a0825773b
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.0 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.0
index 2d1fd7690a7a..d346cfd4a882 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.0
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3.0
 SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.3.0/unordered-containers-0.2.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dbf3def6d9df08424d2c8c81a3ca35a0
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.2 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.2
index 1940c18caae4..7536f1abd6d5 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3.2
 SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.3.2/unordered-containers-0.2.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fd6f3c7ca2d502f5a0e64ad11a60e277
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.3 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.3
index 5d3fa47b8b7f..0bd32139cc43 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.3
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3.3
 SRC_URI=mirror://hackage/packages/archive/unordered-containers/0.2.3.3/unordered-containers-0.2.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a43da009f410af0d3b96d347279aa7ed
diff --git a/metadata/md5-cache/dev-haskell/url-2.1.3-r1 b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
index 255b5cb12d1f..cd9a54769405 100644
--- a/metadata/md5-cache/dev-haskell/url-2.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.3
 SRC_URI=mirror://hackage/packages/archive/url/2.1.3/url-2.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fa6161d4fb2c56808e44933b24e744ed
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.0.1 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.0.1
index f89c0a11b292..63c4ea17cde8 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/utf8-light/0.4.0.1/utf8-light-0.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a86bcfe6a490c9f3a4faa23f23b2a14c
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
index d9a527820afd..a90455d459b8 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.2
 SRC_URI=mirror://hackage/packages/archive/utf8-light/0.4.2/utf8-light-0.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4aab8c0f097963cdf4cd2d1e6fc0b8ff
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1 b/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
index cfbb667ee6f0..26d24afbf48c 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.7
 SRC_URI=mirror://hackage/packages/archive/utf8-string/0.3.7/utf8-string-0.3.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dfdd65a09cbfba53f0a544edf80bf640
diff --git a/metadata/md5-cache/dev-haskell/uuagc-0.9.24 b/metadata/md5-cache/dev-haskell/uuagc-0.9.24
index 517e4f28f85e..553a1d40b741 100644
--- a/metadata/md5-cache/dev-haskell/uuagc-0.9.24
+++ b/metadata/md5-cache/dev-haskell/uuagc-0.9.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10 dev-haskell/cabal >=dev-haskell/uulib-0.9.12
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/uuagc/0.9.24/uuagc-0.9.24.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8720c0261d41fba397f78e3006f7ed50
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.2.13 b/metadata/md5-cache/dev-haskell/uuid-1.2.13
index a548308b7bc5..43982008d17f 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.2.13
+++ b/metadata/md5-cache/dev-haskell/uuid-1.2.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.10:=[profile?] >=dev-haskell/maccatcher-1.0:=[profile?] <dev-haskell/maccatcher-2.2:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.13
 SRC_URI=mirror://hackage/packages/archive/uuid/1.2.13/uuid-1.2.13.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=961d18a110cab2c0ae3a323f92c0bf22
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.2.14 b/metadata/md5-cache/dev-haskell/uuid-1.2.14
index eaa54ccb0276..10b30c2e450e 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.2.14
+++ b/metadata/md5-cache/dev-haskell/uuid-1.2.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.11:=[profile?] >=dev-haskell/maccatcher-1.0:=[profile?] <dev-haskell/maccatcher-2.2:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.14
 SRC_URI=mirror://hackage/packages/archive/uuid/1.2.14/uuid-1.2.14.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2c1919b3b8173818a895bc14fc0fa78f
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.3-r1 b/metadata/md5-cache/dev-haskell/uuid-1.3.3-r1
index 00fb2379d101..76e400ca19ef 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-6.12.1:= || ( ( >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.2.0:=[profile?] ) ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
 SLOT=0/1.3.3
 SRC_URI=mirror://hackage/packages/archive/uuid/1.3.3/uuid-1.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3c86472381c9e0d6cc3f7ef0333bd648
diff --git a/metadata/md5-cache/dev-haskell/uulib-0.9.12 b/metadata/md5-cache/dev-haskell/uulib-0.9.12
index 46b323cb2d15..e46d6f321ed9 100644
--- a/metadata/md5-cache/dev-haskell/uulib-0.9.12
+++ b/metadata/md5-cache/dev-haskell/uulib-0.9.12
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.8.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/uulib/0.9.12/uulib-0.9.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=071bb09ba7012b99b3d6629605f7cfef
diff --git a/metadata/md5-cache/dev-haskell/uulib-0.9.14 b/metadata/md5-cache/dev-haskell/uulib-0.9.14
index 85c1b30fa7e9..6391b3386532 100644
--- a/metadata/md5-cache/dev-haskell/uulib-0.9.14
+++ b/metadata/md5-cache/dev-haskell/uulib-0.9.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/uulib/0.9.14/uulib-0.9.14.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=46d02a4923dea1f9191e017f979d725d
diff --git a/metadata/md5-cache/dev-haskell/vault-0.2.0.4 b/metadata/md5-cache/dev-haskell/vault-0.2.0.4
index b841c1dc769b..b9c4f6900f23 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/vault-0.2.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.1.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.2.0.4
 SRC_URI=mirror://hackage/packages/archive/vault/0.2.0.4/vault-0.2.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5a9269240a5de65304369c45ef116ab0
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.0.0 b/metadata/md5-cache/dev-haskell/vault-0.3.0.0
index ae540304775f..42688df8a023 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.0.0
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/0.3.0.0
 SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.0/vault-0.3.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3585fc3788322dd872ff592dfcfd9078
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.0.2 b/metadata/md5-cache/dev-haskell/vault-0.3.0.2
index 206ca63ee999..98739bf8f418 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.2/vault-0.3.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ff0ecc4c1e2221b26771062ca6c3a780
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.0.3 b/metadata/md5-cache/dev-haskell/vault-0.3.0.3
index 0956e58bd54e..34db420d8774 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.0.3
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.3
 SRC_URI=mirror://hackage/packages/archive/vault/0.3.0.3/vault-0.3.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f4025f46b7b1a25fffe7070bc005542
diff --git a/metadata/md5-cache/dev-haskell/vector-0.10.0.1 b/metadata/md5-cache/dev-haskell/vector-0.10.0.1
index c3f7d7a07f8c..9910722e892c 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.10.0.1
+++ b/metadata/md5-cache/dev-haskell/vector-0.10.0.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test
-DEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.12.3:= >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.12.3:= ppc? ( >=dev-lang/ghc-7.6.1 ) >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Efficient Arrays
 EAPI=5
 HOMEPAGE=http://code.haskell.org/vector
 IUSE=doc hscolour profile
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.12.3:=
+RDEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.12.3:= ppc? ( >=dev-lang/ghc-7.6.1 )
 SLOT=0/0.10.0.1
 SRC_URI=mirror://hackage/packages/archive/vector/0.10.0.1/vector-0.10.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=86ec6ebece5669a5756deadf2b9e6cac
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=4f15f899a4d2d16ff02a5cafa5855a7f
diff --git a/metadata/md5-cache/dev-haskell/vector-0.10.9.1 b/metadata/md5-cache/dev-haskell/vector-0.10.9.1
index 4330168fe7c7..fc9e3a6998dd 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.10.9.1
+++ b/metadata/md5-cache/dev-haskell/vector-0.10.9.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test
-DEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.10.4:= ppc? ( >=dev-lang/ghc-7.6.1 ) >=dev-haskell/cabal-1.6.0.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Efficient Arrays
 EAPI=5
 HOMEPAGE=https://github.com/haskell/vector
 IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-lang/ghc-6.10.4:= ppc? ( >=dev-lang/ghc-7.6.1 )
 SLOT=0/0.10.9.1
 SRC_URI=mirror://hackage/packages/archive/vector/0.10.9.1/vector-0.10.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=51f07bd2d536ce2bf7a841ac2d68bc66
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=a3bf124e62919d74521f25070c6d61e0
diff --git a/metadata/md5-cache/dev-haskell/vector-0.9.1 b/metadata/md5-cache/dev-haskell/vector-0.9.1
index 6cee6bd41be8..7aa6cb6064da 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.9.1
+++ b/metadata/md5-cache/dev-haskell/vector-0.9.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
 DEPEND==dev-haskell/primitive-0.4*[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Efficient Arrays
 EAPI=4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/primitive-0.4*[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/vector/0.9.1/vector-0.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=144e9a7e661b81f5e2ab7c3194c612c1
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=68b0206a2e84731d580c10b8e9941206
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.5.4.2 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.5.4.2
index 33cf8842ec23..02f9ca0fe8d9 100644
--- a/metadata/md5-cache/dev-haskell/vector-algorithms-0.5.4.2
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.5.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.3[profile?] <dev-haskell/primitive-0.6[profile?] >=dev-haskell/vector-0.6[profile?] <dev-haskell/vector-0.11[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/vector-algorithms/0.5.4.2/vector-algorithms-0.5.4.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3160af4f1dffa3895bb9a94fa9ac80d3
diff --git a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.1.0 b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.1.0
index 64fbb50c5f51..013e08a0ba67 100644
--- a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/cereal:=[profile?] >=dev-haskell/vector-0.6:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.1.0
 SRC_URI=mirror://hackage/packages/archive/vector-binary-instances/0.2.1.0/vector-binary-instances-0.2.1.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d499d29d84768362a7c50bbf0d5e6ad5
diff --git a/metadata/md5-cache/dev-haskell/vector-instances-3.3 b/metadata/md5-cache/dev-haskell/vector-instances-3.3
index d1fe985155e8..4acddf72035d 100644
--- a/metadata/md5-cache/dev-haskell/vector-instances-3.3
+++ b/metadata/md5-cache/dev-haskell/vector-instances-3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.3
 SRC_URI=mirror://hackage/packages/archive/vector-instances/3.3/vector-instances-3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=71b3910b2707d1fc199a7d7ad29ffb85
diff --git a/metadata/md5-cache/dev-haskell/void-0.6 b/metadata/md5-cache/dev-haskell/void-0.6
index 22184ea8fc7c..b14dc7987b87 100644
--- a/metadata/md5-cache/dev-haskell/void-0.6
+++ b/metadata/md5-cache/dev-haskell/void-0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6
 SRC_URI=mirror://hackage/packages/archive/void/0.6/void-0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=02921caa9470a5ca28953752c2847a59
diff --git a/metadata/md5-cache/dev-haskell/void-0.6.1 b/metadata/md5-cache/dev-haskell/void-0.6.1
index eb171369f380..4d04c618a01a 100644
--- a/metadata/md5-cache/dev-haskell/void-0.6.1
+++ b/metadata/md5-cache/dev-haskell/void-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.1
 SRC_URI=mirror://hackage/packages/archive/void/0.6.1/void-0.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8293c6f737477fac9a3e16a951403a20
diff --git a/metadata/md5-cache/dev-haskell/wai-1.4.0.1-r1 b/metadata/md5-cache/dev-haskell/wai-1.4.0.1-r1
index 9c1c6d74a409..72226350ed96 100644
--- a/metadata/md5-cache/dev-haskell/wai-1.4.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/wai-1.4.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.4.0.1
 SRC_URI=mirror://hackage/packages/archive/wai/1.4.0.1/wai-1.4.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8f475960f58f4800f33df30aca9b87df
diff --git a/metadata/md5-cache/dev-haskell/wai-1.4.0.2 b/metadata/md5-cache/dev-haskell/wai-1.4.0.2
index c31447db0e2b..8a0b7a283429 100644
--- a/metadata/md5-cache/dev-haskell/wai-1.4.0.2
+++ b/metadata/md5-cache/dev-haskell/wai-1.4.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.4.0.2
 SRC_URI=mirror://hackage/packages/archive/wai/1.4.0.2/wai-1.4.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d1848b26643be740f5f902bd8ff42032
diff --git a/metadata/md5-cache/dev-haskell/wai-2.0.0 b/metadata/md5-cache/dev-haskell/wai-2.0.0
index d7421f869e12..ee9449fb09a6 100644
--- a/metadata/md5-cache/dev-haskell/wai-2.0.0
+++ b/metadata/md5-cache/dev-haskell/wai-2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.0
 SRC_URI=mirror://hackage/packages/archive/wai/2.0.0/wai-2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f9693fd8766b69fa047dea61f4f909f
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-1.3.1.3 b/metadata/md5-cache/dev-haskell/wai-app-static-1.3.1.3
index 1e8ac50f0d2f..c4e7956baaf4 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-1.3.1.3
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-1.3.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-0.7:=[cryptoapi,profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] =dev-haskell/mime-types-0.1*:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.1.3
 SRC_URI=mirror://hackage/packages/archive/wai-app-static/1.3.1.3/wai-app-static-1.3.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=32f9a1808d9bbe8fe6709b932d2e2575
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-1.3.2.1 b/metadata/md5-cache/dev-haskell/wai-app-static-1.3.2.1
index ab9553cb2b69..abec2ae38aa5 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-1.3.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.2.1
 SRC_URI=mirror://hackage/packages/archive/wai-app-static/1.3.2.1/wai-app-static-1.3.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aeee57c0e5c7c88518565f08c9958f96
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-2.0.0.1 b/metadata/md5-cache/dev-haskell/wai-app-static-2.0.0.1
index 7b0c19296402..9906c195527a 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-2.0.0.1
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-2.0.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] >=dev-haskell/crypto-api-0.12.2:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.1:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.0.0.1
 SRC_URI=mirror://hackage/packages/archive/wai-app-static/2.0.0.1/wai-app-static-2.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4edeb59aa54998fa4ae0384503881e72
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.3 b/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.3
index 88c33a4c9af8..d176d6e74b0a 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.3
+++ b/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/date-cache-0.3*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] <dev-haskell/fast-logger-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] =dev-haskell/stringsearch-0.3*:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] <dev-haskell/wai-logger-0.4:=[profile?] dev-haskell/word8:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.4.3
 SRC_URI=mirror://hackage/packages/archive/wai-extra/1.3.4.3/wai-extra-1.3.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4143520cc0eb5902d89bbe88923a99fe
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.5 b/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.5
index ac01ea79ac94..b158efd0df97 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.5
+++ b/metadata/md5-cache/dev-haskell/wai-extra-1.3.4.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/date-cache-0.3:=[profile?] <dev-haskell/date-cache-0.4:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] <dev-haskell/fast-logger-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] <dev-haskell/wai-logger-0.4:=[profile?] dev-haskell/word8:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.4.5
 SRC_URI=mirror://hackage/packages/archive/wai-extra/1.3.4.5/wai-extra-1.3.4.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ac6dc9ad8b69cce866e674b5228bafc7
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-2.0.0.1 b/metadata/md5-cache/dev-haskell/wai-extra-2.0.0.1
index c2488149d9a5..2d124e574615 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-2.0.0.1
+++ b/metadata/md5-cache/dev-haskell/wai-extra-2.0.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.1:=[profile?] >=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.1:=[profile?] dev-haskell/word8:=[profile?] >=dev-haskell/zlib-conduit-0.5:=[profile?] <dev-haskell/zlib-conduit-1.1:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/2.0.0.1
 SRC_URI=mirror://hackage/packages/archive/wai-extra/2.0.0.1/wai-extra-2.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dfae142899f143c36691bd4d3b187423
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-0.3.1 b/metadata/md5-cache/dev-haskell/wai-logger-0.3.1
index 6a9a19585f38..3328c6fe1c55 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-0.3.1
+++ b/metadata/md5-cache/dev-haskell/wai-logger-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/date-cache-0.3:=[profile?] >=dev-haskell/fast-logger-0.3:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] dev-haskell/wai:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/wai-logger/0.3.1/wai-logger-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9603466910f3375fc4888cb97bea3e16
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.0.1 b/metadata/md5-cache/dev-haskell/wai-logger-2.0.1
index dfb26cb4abc6..274b31430c28 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-2.0.1
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/fast-logger-2.0.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] dev-haskell/unix-time:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.1
 SRC_URI=mirror://hackage/packages/archive/wai-logger/2.0.1/wai-logger-2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9b7dae32b961e0ab949d59c88613727d
diff --git a/metadata/md5-cache/dev-haskell/wai-test-1.3.1 b/metadata/md5-cache/dev-haskell/wai-test-1.3.1
index e165a2f9a251..c2de17d74340 100644
--- a/metadata/md5-cache/dev-haskell/wai-test-1.3.1
+++ b/metadata/md5-cache/dev-haskell/wai-test-1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] =dev-haskell/hunit-1.2*:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.1
 SRC_URI=mirror://hackage/packages/archive/wai-test/1.3.1/wai-test-1.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=205d2ec6604a0bfd38b5b8a7b7f141f2
diff --git a/metadata/md5-cache/dev-haskell/wai-test-1.3.1.1 b/metadata/md5-cache/dev-haskell/wai-test-1.3.1.1
index a201a4ccb7fd..7fb739d368d6 100644
--- a/metadata/md5-cache/dev-haskell/wai-test-1.3.1.1
+++ b/metadata/md5-cache/dev-haskell/wai-test-1.3.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] =dev-haskell/hunit-1.2*:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.1.1
 SRC_URI=mirror://hackage/packages/archive/wai-test/1.3.1.1/wai-test-1.3.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=335683f7d10bb078d184e43784b4dcec
diff --git a/metadata/md5-cache/dev-haskell/wai-test-2.0.0.1 b/metadata/md5-cache/dev-haskell/wai-test-2.0.0.1
index 8fbe0df185dd..a8e30fbc0a5a 100644
--- a/metadata/md5-cache/dev-haskell/wai-test-2.0.0.1
+++ b/metadata/md5-cache/dev-haskell/wai-test-2.0.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.0.1
 SRC_URI=mirror://hackage/packages/archive/wai-test/2.0.0.1/wai-test-2.0.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=50dd519de5c27d71de4acf93adfddadf
diff --git a/metadata/md5-cache/dev-haskell/warp-1.3.9.1 b/metadata/md5-cache/dev-haskell/warp-1.3.9.1
index f2c0cf92ded2..42545bf50707 100644
--- a/metadata/md5-cache/dev-haskell/warp-1.3.9.1
+++ b/metadata/md5-cache/dev-haskell/warp-1.3.9.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/http-attoparsec:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/network-conduit-0.5:=[profile?] <dev-haskell/network-conduit-1.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/void:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/network-2.3:=[profile?]
 SLOT=0/1.3.9.1
 SRC_URI=mirror://hackage/packages/archive/warp/1.3.9.1/warp-1.3.9.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6fd9e8a5b3554deea2110cb118f2c6ec
diff --git a/metadata/md5-cache/dev-haskell/warp-1.3.9.2 b/metadata/md5-cache/dev-haskell/warp-1.3.9.2
index 3da8746ba9d4..ab2f51069c8e 100644
--- a/metadata/md5-cache/dev-haskell/warp-1.3.9.2
+++ b/metadata/md5-cache/dev-haskell/warp-1.3.9.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/http-attoparsec:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/network-conduit-0.5:=[profile?] <dev-haskell/network-conduit-1.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/void:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-lang/ghc-6.10.4:= allow-sendfilefd? ( dev-haskell/hashable:=[profile?] ) >=dev-haskell/network-2.3:=[profile?]
 SLOT=0/1.3.9.2
 SRC_URI=mirror://hackage/packages/archive/warp/1.3.9.2/warp-1.3.9.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6aaefe7ebdf6ea6764a369aee950b8b1
diff --git a/metadata/md5-cache/dev-haskell/warp-2.0.1 b/metadata/md5-cache/dev-haskell/warp-2.0.1
index c01508d3dc68..05dbde8b33a1 100644
--- a/metadata/md5-cache/dev-haskell/warp-2.0.1
+++ b/metadata/md5-cache/dev-haskell/warp-2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/http-attoparsec:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/network-conduit-0.5:=[profile?] <dev-haskell/network-conduit-1.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] dev-haskell/void:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.1:=[profile?] >=dev-lang/ghc-6.10.4:= allow-sendfilefd? ( dev-haskell/hashable:=[profile?] ) >=dev-haskell/network-2.3:=[profile?]
 SLOT=0/2.0.1
 SRC_URI=mirror://hackage/packages/archive/warp/2.0.1/warp-2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f2a83c7c53d9214abac3280f91a6a801
diff --git a/metadata/md5-cache/dev-haskell/warp-tls-2.0.0 b/metadata/md5-cache/dev-haskell/warp-tls-2.0.0
index f1fcca5c20d5..e195142048df 100644
--- a/metadata/md5-cache/dev-haskell/warp-tls-2.0.0
+++ b/metadata/md5-cache/dev-haskell/warp-tls-2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/certificate-1.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/crypto-random-api-0.2:=[profile?] >=dev-haskell/cryptocipher-0.3:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] >=dev-haskell/network-conduit-0.6:=[profile?] <dev-haskell/network-conduit-1.1:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-haskell/tls-extra-0.6:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.1:=[profile?] >=dev-haskell/warp-2.0:=[profile?] <dev-haskell/warp-2.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cprng-aes-0.5.0:=[profile?] >=dev-haskell/tls-1.1.3:=[profile?]
 SLOT=0/2.0.0
 SRC_URI=mirror://hackage/packages/archive/warp-tls/2.0.0/warp-tls-2.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1e2286680cc071c7fd516250668d458d
diff --git a/metadata/md5-cache/dev-haskell/word8-0.0.3 b/metadata/md5-cache/dev-haskell/word8-0.0.3
index a409ae17dd4e..561e9ee0a368 100644
--- a/metadata/md5-cache/dev-haskell/word8-0.0.3
+++ b/metadata/md5-cache/dev-haskell/word8-0.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.3
 SRC_URI=mirror://hackage/packages/archive/word8/0.0.3/word8-0.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f5a369588614d16fc170c783b5890801
diff --git a/metadata/md5-cache/dev-haskell/word8-0.0.4 b/metadata/md5-cache/dev-haskell/word8-0.0.4
index 7e0ff2bee118..4ab5cca0900c 100644
--- a/metadata/md5-cache/dev-haskell/word8-0.0.4
+++ b/metadata/md5-cache/dev-haskell/word8-0.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.4
 SRC_URI=mirror://hackage/packages/archive/word8/0.0.4/word8-0.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1da503db9206be61b520d3c35e1c225f
diff --git a/metadata/md5-cache/dev-haskell/wxc-0.90.0.4 b/metadata/md5-cache/dev-haskell/wxc-0.90.0.4
index 494dd93cc922..bc13afb7d0b8 100644
--- a/metadata/md5-cache/dev-haskell/wxc-0.90.0.4
+++ b/metadata/md5-cache/dev-haskell/wxc-0.90.0.4
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=>=dev-haskell/wxdirect-0.90:2.9=[profile?] x11-libs/wxGTK:2.9=[X,gstreamer,opengl] >=dev-lang/ghc-6.10.4:=
 SLOT=2.9/0.90.0.4
 SRC_URI=mirror://hackage/packages/archive/wxc/0.90.0.4/wxc-0.90.0.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	755f4b28ecdf7c1213011108e566babc
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	755f4b28ecdf7c1213011108e566babc
 _md5_=4b99f66af0c904cf1eed819e1b1c577c
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.13.2.3 b/metadata/md5-cache/dev-haskell/wxcore-0.13.2.3
index c47d610896d9..05c826738ef5 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.13.2.3
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.13.2.3
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >dev-haskell/wxdirect-0.12.1.2:2.8=[profile?] <dev-haskell/wxdirect-0.90:2.8=[profile?] >=dev-lang/ghc-6.12.1:= x11-libs/wxGTK:2.8=[X,gstreamer,opengl]
 SLOT=2.8/0.13.2.3
 SRC_URI=mirror://hackage/packages/archive/wxcore/0.13.2.3/wxcore-0.13.2.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	755f4b28ecdf7c1213011108e566babc
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	wxwidgets	755f4b28ecdf7c1213011108e566babc
 _md5_=678e02e5096ab8b62552a7a06cd3d7db
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.90.0.3 b/metadata/md5-cache/dev-haskell/wxcore-0.90.0.3
index 0541ebd6ee1c..62f1df027ba5 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.90.0.3
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.90.0.3
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.90.0.4:2.9=[profile?] >=dev-haskell/wxdirect-0.90:2.9=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=2.9/0.90.0.3
 SRC_URI=mirror://hackage/packages/archive/wxcore/0.90.0.3/wxcore-0.90.0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d81464bf1e7e7aa7c84b854c40574cf3
diff --git a/metadata/md5-cache/dev-haskell/wxdirect-0.13.1.2 b/metadata/md5-cache/dev-haskell/wxdirect-0.13.1.2
index d1b2f71a1315..8f288ccdbdba 100644
--- a/metadata/md5-cache/dev-haskell/wxdirect-0.13.1.2
+++ b/metadata/md5-cache/dev-haskell/wxdirect-0.13.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/strict-0.3:=[profile?] <dev-haskell/strict-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2.8/0.13.1.2
 SRC_URI=mirror://hackage/packages/archive/wxdirect/0.13.1.2/wxdirect-0.13.1.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=95e0c70a19868b9813bd6c6b6d94700a
diff --git a/metadata/md5-cache/dev-haskell/wxdirect-0.90.0.1 b/metadata/md5-cache/dev-haskell/wxdirect-0.90.0.1
index 66456f5c19eb..a4231d364be2 100644
--- a/metadata/md5-cache/dev-haskell/wxdirect-0.90.0.1
+++ b/metadata/md5-cache/dev-haskell/wxdirect-0.90.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2.9/0.90.0.1
 SRC_URI=mirror://hackage/packages/archive/wxdirect/0.90.0.1/wxdirect-0.90.0.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9fef2bdfabe98b7687a30989e5c63f00
diff --git a/metadata/md5-cache/dev-haskell/wxhaskell-0.12.1.6 b/metadata/md5-cache/dev-haskell/wxhaskell-0.12.1.6
index f03085c0bbd2..0d689e0ddbe1 100644
--- a/metadata/md5-cache/dev-haskell/wxhaskell-0.12.1.6
+++ b/metadata/md5-cache/dev-haskell/wxhaskell-0.12.1.6
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/stm >=dev-haskell/wxcore-0.12.1.6 >=dev-lang/ghc-6.10
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/wx/0.12.1.6/wx-0.12.1.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b76d3a19be9cc9d06b1ca50c800d1c70
diff --git a/metadata/md5-cache/dev-haskell/wxhaskell-0.13.2.1-r1 b/metadata/md5-cache/dev-haskell/wxhaskell-0.13.2.1-r1
index 8d96075865c2..7196ae239140 100644
--- a/metadata/md5-cache/dev-haskell/wxhaskell-0.13.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/wxhaskell-0.13.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.13.1:2.8=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2.8/0.13.2.1
 SRC_URI=mirror://hackage/packages/archive/wx/0.13.2.1/wx-0.13.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=267656ab5d26c8b917208d1ac39a50f3
diff --git a/metadata/md5-cache/dev-haskell/wxhaskell-0.90 b/metadata/md5-cache/dev-haskell/wxhaskell-0.90
index 0ff5ada14c01..ff2048ab300a 100644
--- a/metadata/md5-cache/dev-haskell/wxhaskell-0.90
+++ b/metadata/md5-cache/dev-haskell/wxhaskell-0.90
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.90:2.9=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2.9/0.90
 SRC_URI=mirror://hackage/packages/archive/wx/0.90/wx-0.90.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4b6b7e5bd8b2a0431d0a26b1fcb2cdf1
diff --git a/metadata/md5-cache/dev-haskell/wxhaskell-0.90.0.1 b/metadata/md5-cache/dev-haskell/wxhaskell-0.90.0.1
index 30e09cc1923b..ce4cdb480230 100644
--- a/metadata/md5-cache/dev-haskell/wxhaskell-0.90.0.1
+++ b/metadata/md5-cache/dev-haskell/wxhaskell-0.90.0.1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.90:2.9=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2.9/0.90.0.1
 SRC_URI=mirror://hackage/packages/archive/wx/0.90.0.1/wx-0.90.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3e707069ae8fa2822c51404f467c8e74
diff --git a/metadata/md5-cache/dev-haskell/x11-1.4.6.1 b/metadata/md5-cache/dev-haskell/x11-1.4.6.1
index 4d16e08d6b55..4be6c01faa5f 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.4.6.1
+++ b/metadata/md5-cache/dev-haskell/x11-1.4.6.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8 x11-libs/libX11 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11/1.4.6.1/X11-1.4.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5e1b5f229017f7d8d23f8d2adbe35952
diff --git a/metadata/md5-cache/dev-haskell/x11-1.5.0.0 b/metadata/md5-cache/dev-haskell/x11-1.5.0.0
index 6289a9c608ee..4fd826526b12 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.5.0.0
+++ b/metadata/md5-cache/dev-haskell/x11-1.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.8.2 x11-libs/libX11 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11/1.5.0.0/X11-1.5.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa5c434bbea5a74e16da417f059068bf
diff --git a/metadata/md5-cache/dev-haskell/x11-1.5.0.0-r1 b/metadata/md5-cache/dev-haskell/x11-1.5.0.0-r1
index 15c2df17c4b3..6f7270108703 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.5.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/x11-1.5.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.8.2 x11-libs/libX11 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11/1.5.0.0/X11-1.5.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d0d905f26ce539cb76be3b66a8fdf6de
diff --git a/metadata/md5-cache/dev-haskell/x11-1.5.0.1 b/metadata/md5-cache/dev-haskell/x11-1.5.0.1
index c62df1c1356f..ed34d7222827 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.5.0.1
+++ b/metadata/md5-cache/dev-haskell/x11-1.5.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.8.2 x11-libs/libX11 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11/1.5.0.1/X11-1.5.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b722c5de257c59109951677c250ff17c
diff --git a/metadata/md5-cache/dev-haskell/x11-1.6.0.2 b/metadata/md5-cache/dev-haskell/x11-1.6.0.2
index 3569c938299e..904e32f6be50 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.6.0.2
+++ b/metadata/md5-cache/dev-haskell/x11-1.6.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.8.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11/1.6.0.2/X11-1.6.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=57ba0ca6af40e886771d3d78830fc64a
diff --git a/metadata/md5-cache/dev-haskell/x11-1.6.0.2-r1 b/metadata/md5-cache/dev-haskell/x11-1.6.0.2-r1
index 91107b530a7c..d5c37da3d37e 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.6.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/x11-1.6.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr xinerama? ( x11-libs/libXinerama )
 SLOT=0/1.6.0.2
 SRC_URI=mirror://hackage/packages/archive/X11/1.6.0.2/X11-1.6.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=03bf76d7b26e12b02e2f59c04b4663b5
diff --git a/metadata/md5-cache/dev-haskell/x11-1.6.1.1 b/metadata/md5-cache/dev-haskell/x11-1.6.1.1
index ebffc5380327..8dc0afdcbb57 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.6.1.1
+++ b/metadata/md5-cache/dev-haskell/x11-1.6.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr screensaver? ( x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
 SLOT=0/1.6.1.1
 SRC_URI=mirror://hackage/packages/archive/X11/1.6.1.1/X11-1.6.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e1647abab4085818a70d5e833004b67f
diff --git a/metadata/md5-cache/dev-haskell/x11-xft-0.3 b/metadata/md5-cache/dev-haskell/x11-xft-0.3
index b564c1ca97d4..290b98aba1d7 100644
--- a/metadata/md5-cache/dev-haskell/x11-xft-0.3
+++ b/metadata/md5-cache/dev-haskell/x11-xft-0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11-xft/0.3/X11-xft-0.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=505619e3094746e3a004790f32399704
diff --git a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1 b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1
index d6c21ac10ae5..47df7593208b 100644
--- a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1
+++ b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ab5ccc41245f13313a8140425193fd5c
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.0.1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.0.1
index ebd414d884da..c8c7289376ad 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.0.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.0.1/xhtml-3000.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b3775d500fd7c48fbc219e331ac9d240
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
index 9815a3dbe974..c38e328b20de 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.1/xhtml-3000.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea032c7829b8fd2c1f0bad58352f5f98
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
index 0ada4bbccb97..cedde36f5fd5 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/3000.2.1
 SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.1/xhtml-3000.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5664e963b45f7a5dd581c3e2a0d183a4
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.12 b/metadata/md5-cache/dev-haskell/xml-1.3.12
index 750ade71e660..02531501442c 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.12
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.12/xml-1.3.12.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=413535e02f27a6f856c6fc82a387b331
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.13 b/metadata/md5-cache/dev-haskell/xml-1.3.13
index 0b3ae2f80817..f5d236ee0ba5 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.13
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.13
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.13/xml-1.3.13.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=028f8178d475fc9255e4510037bdad7e
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.8 b/metadata/md5-cache/dev-haskell/xml-1.3.8
index 74cf0028e7c7..eb670d802003 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.8
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.8/xml-1.3.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=00bd66fbea1662b5ef0edbed4556c73b
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.7 b/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.7
index 67766ee09ef0..af574387b0a7 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.7
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/attoparsec-conduit-1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
 SLOT=0/1.1.0.7
 SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.1.0.7/xml-conduit-1.1.0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cc022c36315c2417d2bf36ecbca0aaeb
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.9 b/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.9
index f8da680abfad..49285adfdbba 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.9
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.1.0.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/attoparsec-conduit-1.0:=[profile?] >=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.9
 SRC_URI=mirror://hackage/packages/archive/xml-conduit/1.1.0.9/xml-conduit-1.1.0.9.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d5efab29992f614897edc03a13fdf886
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.4 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.4
index 204813d8e0fb..83f984e54362 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.4
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.4
 SRC_URI=mirror://hackage/packages/archive/xml-hamlet/0.4.0.4/xml-hamlet-0.4.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=efa1e1ddeff87c6e6526a96498e65bd7
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.5 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.5
index 184dc34d942f..2b14fb7cf307 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.5
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.0:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.5
 SRC_URI=mirror://hackage/packages/archive/xml-hamlet/0.4.0.5/xml-hamlet-0.4.0.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c9c61238facad921ab7168e4eba736ae
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.6 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.6
index b37593180962..a4945e06a8e4 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.6
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.4.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.6
 SRC_URI=mirror://hackage/packages/archive/xml-hamlet/0.4.0.6/xml-hamlet-0.4.0.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ea2aad458db43b6fb8e81eb3759627cc
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3 b/metadata/md5-cache/dev-haskell/xml-types-0.3
index 4722a814dd19..3e374cf8134c 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xml-types/0.3/xml-types-0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=5d52a85b39094cd7ce4ec8a5c831ed8f
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3.3 b/metadata/md5-cache/dev-haskell/xml-types-0.3.3
index b87a9eabe6fe..3cd6dfcf7c90 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3.3
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/xml-types/0.3.3/xml-types-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d599f195cca75bc6b50eed63d0f18d70
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3.4 b/metadata/md5-cache/dev-haskell/xml-types-0.3.4
index e9b3e5da5b58..470de0fabaf0 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3.4
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Basic types for representing XML
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/haskell-xml/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.4
 SRC_URI=mirror://hackage/packages/archive/xml-types/0.3.4/xml-types-0.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4a32ff79f8b32b9d8c5b07dd7470a2a5
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=2eca18427399a7d0d2d2267348686f94
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.3 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.3
index 90252d8061c4..05440d85b3ac 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.3
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] =dev-haskell/network-2*:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.3
 SRC_URI=mirror://hackage/packages/archive/xss-sanitize/0.3.3/xss-sanitize-0.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f8434b536202f724cd84911e83e69327
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.4 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.4
index 9fde80cb614d..401101b64ab8 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.4
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] =dev-haskell/network-2*:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.4
 SRC_URI=mirror://hackage/packages/archive/xss-sanitize/0.3.4/xss-sanitize-0.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=05dddc52da69fb9f942961210c868a37
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.8.4.1 b/metadata/md5-cache/dev-haskell/yaml-0.8.4.1
index cbf09c11be33..55410a0c25ef 100644
--- a/metadata/md5-cache/dev-haskell/yaml-0.8.4.1
+++ b/metadata/md5-cache/dev-haskell/yaml-0.8.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= system-libyaml? ( dev-libs/libyaml )
 SLOT=0/0.8.4.1
 SRC_URI=mirror://hackage/packages/archive/yaml/0.8.4.1/yaml-0.8.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bde0a8566db7e1f94bbabf03de0c85e7
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.8.5.2 b/metadata/md5-cache/dev-haskell/yaml-0.8.5.2
index 9f003da4d3d9..8acc2966e44b 100644
--- a/metadata/md5-cache/dev-haskell/yaml-0.8.5.2
+++ b/metadata/md5-cache/dev-haskell/yaml-0.8.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.1:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= system-libyaml? ( dev-libs/libyaml )
 SLOT=0/0.8.5.2
 SRC_URI=mirror://hackage/packages/archive/yaml/0.8.5.2/yaml-0.8.5.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8920359b7dbb63da35588a08a05f16c2
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.1.9.2 b/metadata/md5-cache/dev-haskell/yesod-1.1.9.2
index 410cab46ac4a..545ee4018f9e 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.1.9.2
+++ b/metadata/md5-cache/dev-haskell/yesod-1.1.9.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/cabal:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?] dev-haskell/file-embed:=[profile?] =dev-haskell/fsnotify-0.0*:=[profile?] >=dev-haskell/ghc-paths-0.1:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] dev-haskell/http-conduit:=[profile?] >=dev-haskell/http-reverse-proxy-0.1.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/lifted-base:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-conduit:=[profile?] >=dev-haskell/optparse-applicative-0.4:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/project-template-0.1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] >=dev-haskell/shakespeare-1.0.2:=[profile?] <dev-haskell/shakespeare-1.1:=[profile?] >=dev-haskell/shakespeare-css-1.0.2:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] =dev-haskell/shakespeare-text-1.0*:=[profile?] =dev-haskell/split-0.2*:=[profile?] =dev-haskell/system-fileio-0.3*:=[profile?] =dev-haskell/system-filepath-0.4*:=[profile?] =dev-haskell/tar-0.4*:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/warp-1.3*:=[profile?] =dev-haskell/yaml-0.8*:=[profile?] =dev-haskell/yesod-auth-1.1*:=[profile?] >=dev-haskell/yesod-core-1.1.5:=[profile?] <dev-haskell/yesod-core-1.2:=[profile?] >=dev-haskell/yesod-default-1.1.3:=[profile?] <dev-haskell/yesod-default-1.2:=[profile?] >=dev-haskell/yesod-form-1.1:=[profile?] <dev-haskell/yesod-form-1.3:=[profile?] =dev-haskell/yesod-json-1.1*:=[profile?] =dev-haskell/yesod-persistent-1.1*:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.1.9.2
 SRC_URI=mirror://hackage/packages/archive/yesod/1.1.9.2/yesod-1.1.9.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8b08142e644cb168639430f17a6c557d
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.2.0.1 b/metadata/md5-cache/dev-haskell/yesod-1.2.0.1
index f5a85cc54e9f..b8c65b044e1a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/warp-1.3*:=[profile?] dev-haskell/yaml:=[profile?] =dev-haskell/yesod-auth-1.2*:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] =dev-haskell/yesod-form-1.3*:=[profile?] =dev-haskell/yesod-persistent-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod/1.2.0.1/yesod-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f04180b418bfd4791e92449285cc1cee
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.2.1 b/metadata/md5-cache/dev-haskell/yesod-1.2.1
index 9cd6b6094664..11267e923ad4 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.2.1
+++ b/metadata/md5-cache/dev-haskell/yesod-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/warp-1.3*:=[profile?] dev-haskell/yaml:=[profile?] =dev-haskell/yesod-auth-1.2*:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] =dev-haskell/yesod-form-1.3*:=[profile?] =dev-haskell/yesod-persistent-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/yesod/1.2.1/yesod-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0d90e6fd4080260ecf85c8a969e93682
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.2.1.1 b/metadata/md5-cache/dev-haskell/yesod-1.2.1.1
index 9d06b3a94809..30079fab1eb5 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/yesod-1.2.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/warp-1.3*:=[profile?] dev-haskell/yaml:=[profile?] =dev-haskell/yesod-auth-1.2*:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] =dev-haskell/yesod-form-1.3*:=[profile?] =dev-haskell/yesod-persistent-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.1.1
 SRC_URI=mirror://hackage/packages/archive/yesod/1.2.1.1/yesod-1.2.1.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=40494e8454d6150db8c1aa281965fa2d
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.2.2.1 b/metadata/md5-cache/dev-haskell/yesod-1.2.2.1
index 714619565793..6e9eaeb7f07e 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.2.2.1
+++ b/metadata/md5-cache/dev-haskell/yesod-1.2.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] <dev-haskell/wai-extra-1.4:=[profile?] >=dev-haskell/warp-1.3:=[profile?] <dev-haskell/warp-1.4:=[profile?] dev-haskell/yaml:=[profile?] >=dev-haskell/yesod-auth-1.2:=[profile?] <dev-haskell/yesod-auth-1.3:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.2.1
 SRC_URI=mirror://hackage/packages/archive/yesod/1.2.2.1/yesod-1.2.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e7751c3c373d814e1d3c9ac9b20c06f3
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.2.4 b/metadata/md5-cache/dev-haskell/yesod-1.2.4
index f535cb1e1d7b..d7f2267e73a6 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.2.4
+++ b/metadata/md5-cache/dev-haskell/yesod-1.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] dev-haskell/network-conduit:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/warp-1.3:=[profile?] dev-haskell/yaml:=[profile?] >=dev-haskell/yesod-auth-1.2:=[profile?] <dev-haskell/yesod-auth-1.3:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.4
 SRC_URI=mirror://hackage/packages/archive/yesod/1.2.4/yesod-1.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=66135f1dc946a849a94aeb4bf14fe3ab
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.1.7 b/metadata/md5-cache/dev-haskell/yesod-auth-1.1.7
index 441e126c40ed..cf5ca74f8fed 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.1.7
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.1.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/file-embed:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] <dev-haskell/persistent-1.2:=[profile?] >=dev-haskell/persistent-template-1.0:=[profile?] <dev-haskell/persistent-template-1.2:=[profile?] >=dev-haskell/puremd5-2.0:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] >=dev-haskell/sha-1.4.1.3:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] =dev-haskell/yesod-core-1.1*:=[profile?] >=dev-haskell/yesod-form-1.1:=[profile?] <dev-haskell/yesod-form-1.3:=[profile?] =dev-haskell/yesod-json-1.1*:=[profile?] >=dev-haskell/yesod-persistent-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.7
 SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.1.7/yesod-auth-1.1.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b193469a4590f6c47988d697c2fcca00
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.1 b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.1
index 2415e48e9639..4c6ac7c67b9a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] =dev-haskell/persistent-template-1.2*:=[profile?] >=dev-haskell/puremd5-2.0:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/sha-1.4.1.3:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] =dev-haskell/yesod-form-1.3*:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.2.0.1/yesod-auth-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fcf4fc3232c6dda4e3378791914b6da1
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.2 b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.2
index 3a921ff40705..9496130aba86 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] =dev-haskell/persistent-template-1.2*:=[profile?] >=dev-haskell/puremd5-2.0:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/sha-1.4.1.3:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] =dev-haskell/yesod-form-1.3*:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.2
 SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.2.0.2/yesod-auth-1.2.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7f45e209100428170917cae0555abbb0
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.3 b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.3
index 5a681609c1d1..1ae0086cfb68 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.3
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] >=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.3:=[profile?] >=dev-haskell/puremd5-2.0:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/sha-1.4.1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.3
 SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.2.3/yesod-auth-1.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=eea58e5c34a12e2229264ba1dd6be81c
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.4 b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.4
index 92e453295dcb..2cd74189e371 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.2.4
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/authenticate-1.3:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/mime-mail-0.3:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] >=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.3:=[profile?] >=dev-haskell/puremd5-2.0:=[profile?] >=dev-haskell/pwstore-fast-2.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/sha-1.4.1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.4
 SRC_URI=mirror://hackage/packages/archive/yesod-auth/1.2.4/yesod-auth-1.2.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d7400b3638aac4a96e1e9b31a28eff62
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.1.8.3 b/metadata/md5-cache/dev-haskell/yesod-core-1.1.8.3
index 42753902edb4..f0d6c868b42f 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.1.8.3
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.1.8.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3*:=[profile?] >=dev-haskell/clientsession-0.8:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/cookie-0.4*:=[profile?] =dev-haskell/failure-0.2*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/monad-logger-0.2.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] =dev-haskell/shakespeare-i18n-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/yesod-routes-1.1*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.1.8.3
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.1.8.3/yesod-core-1.1.8.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0b92762e7bf9c46a9daf5786a426999e
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.0.4 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.0.4
index 65d5ef4d2093..56ed7f8699dd 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.0.4
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3*:=[profile?] =dev-haskell/clientsession-0.9*:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/cookie-0.4*:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/failure-0.2*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] =dev-haskell/shakespeare-i18n-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/wai-1.4*:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] =dev-haskell/yesod-routes-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.0.4
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.0.4/yesod-core-1.2.0.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=733c82cb7eb94e2cee4aa0c954d79f74
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.1 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.1
index c887406e0e6b..b4de5fa14b72 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.1
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3*:=[profile?] =dev-haskell/clientsession-0.9*:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/cookie-0.4*:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/failure-0.2*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] =dev-haskell/shakespeare-i18n-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/wai-1.4*:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] =dev-haskell/yesod-routes-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.1/yesod-core-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebcc06304910521d9a009ef717e7c39c
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.2 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.2
index a020770aa5e1..6593b6ad48c3 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.2
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3*:=[profile?] =dev-haskell/clientsession-0.9*:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/cookie-0.4*:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/failure-0.2*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] =dev-haskell/shakespeare-i18n-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/wai-1.4*:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] =dev-haskell/yesod-routes-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.2
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.2/yesod-core-1.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=069dd646a3e1b4674e0372dfd11adecc
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.3 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.3
index 6e4dd1d67e45..fa8afeb4da2a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.3
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3*:=[profile?] =dev-haskell/clientsession-0.9*:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] =dev-haskell/cookie-0.4*:=[profile?] dev-haskell/data-default:=[profile?] =dev-haskell/failure-0.2*:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] =dev-haskell/monad-control-0.3*:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-1.0*:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] =dev-haskell/shakespeare-i18n-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] =dev-haskell/wai-1.4*:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] =dev-haskell/yesod-routes-1.2*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.3
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.3/yesod-core-1.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c5c4add8953a1d705264adbf26fb7005
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.4.3 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.4.3
index 2919ec7a8b14..0995a9172d39 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.4.3
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.4.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.4:=[profile?] >=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/wai-1.4:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] <dev-haskell/wai-extra-1.4:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] >=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.4.3
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.4.3/yesod-core-1.2.4.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=641ac630209633505ef7a99993c0cd6f
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.2.6.1 b/metadata/md5-cache/dev-haskell/yesod-core-1.2.6.1
index e6bdfe45dc21..ed50b18253db 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.2.6.1
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.2.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec-conduit:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/fast-logger-0.2:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lifted-base-0.1.2:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-0.5:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-1.3.8:=[profile?] >=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.6.1
 SRC_URI=mirror://hackage/packages/archive/yesod-core/1.2.6.1/yesod-core-1.2.6.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3796ccb35bb175139a8355c9a9a54d4e
diff --git a/metadata/md5-cache/dev-haskell/yesod-default-1.1.3.2 b/metadata/md5-cache/dev-haskell/yesod-default-1.1.3.2
index 25848c6f12ae..045386400ea5 100644
--- a/metadata/md5-cache/dev-haskell/yesod-default-1.1.3.2
+++ b/metadata/md5-cache/dev-haskell/yesod-default-1.1.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/data-default:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/network-conduit-0.5:=[profile?] dev-haskell/safe:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-extra-1.3*:=[profile?] =dev-haskell/warp-1.3*:=[profile?] =dev-haskell/yaml-0.8*:=[profile?] =dev-haskell/yesod-core-1.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.3.2
 SRC_URI=mirror://hackage/packages/archive/yesod-default/1.1.3.2/yesod-default-1.1.3.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=71ce0649f171c166eb36037138590741
diff --git a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
index db1c7b2a3cdd..316a5478c830 100644
--- a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/yesod-default/1.2.0/yesod-default-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d494d82096a72c7caef0b60597f55bb1
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.2.1.3 b/metadata/md5-cache/dev-haskell/yesod-form-1.2.1.3
index 2341a0100d61..c429186b8e2b 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.2.1.3
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.2.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-0.2.6:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] <dev-haskell/persistent-1.2:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] =dev-haskell/yesod-core-1.1*:=[profile?] =dev-haskell/yesod-persistent-1.1*:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.2.1.3
 SRC_URI=mirror://hackage/packages/archive/yesod-form/1.2.1.3/yesod-form-1.2.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=02a700db545c999f5e7c2b7192985935
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.3.0 b/metadata/md5-cache/dev-haskell/yesod-form-1.3.0
index 59e884533319..d161396f33ea 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.3.0
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/network-2.2:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] dev-haskell/resourcet:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] =dev-haskell/yesod-persistent-1.2*:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.0
 SRC_URI=mirror://hackage/packages/archive/yesod-form/1.3.0/yesod-form-1.3.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0a9a6f50d4975bcee0d13d3f665a93f7
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.3.0.1 b/metadata/md5-cache/dev-haskell/yesod-form-1.3.0.1
index d94c8aa772cf..166e9fcbd278 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.3.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.3.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] =dev-haskell/hamlet-1.1*:=[profile?] >=dev-haskell/network-2.2:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] dev-haskell/resourcet:=[profile?] =dev-haskell/shakespeare-css-1.0*:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.2:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] =dev-haskell/yesod-persistent-1.2*:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod-form/1.3.0.1/yesod-form-1.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=59c9f0d50d03d9605166b4fc5fed6a09
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.3.2.2 b/metadata/md5-cache/dev-haskell/yesod-form-1.3.2.2
index 045b363039e6..b91398b1284d 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.3.2.2
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.3.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.2.2
 SRC_URI=mirror://hackage/packages/archive/yesod-form/1.3.2.2/yesod-form-1.3.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b2ca177b0db42d67fb3efe6510fad8b4
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.3.4 b/metadata/md5-cache/dev-haskell/yesod-form-1.3.4
index 0b525bf95335..b446e22ab97d 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.3.4
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.3.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] >=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?] >=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/1.3.4
 SRC_URI=mirror://hackage/packages/archive/yesod-form/1.3.4/yesod-form-1.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=43aa8c2fa6371ce307c8cb200486f5c9
diff --git a/metadata/md5-cache/dev-haskell/yesod-json-1.1.2.2 b/metadata/md5-cache/dev-haskell/yesod-json-1.1.2.2
index 3d81da72446b..3247e80f127c 100644
--- a/metadata/md5-cache/dev-haskell/yesod-json-1.1.2.2
+++ b/metadata/md5-cache/dev-haskell/yesod-json-1.1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/attoparsec-conduit-0.5:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/safe-0.2:=[profile?] >=dev-haskell/shakespeare-js-1.0:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] >=dev-haskell/yesod-core-1.1:=[profile?] >=dev-haskell/yesod-routes-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.2.2
 SRC_URI=mirror://hackage/packages/archive/yesod-json/1.1.2.2/yesod-json-1.1.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4f66f6e3f5f6a60fe21f23beffb601f7
diff --git a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
index eadeaf20e403..c80721619b69 100644
--- a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/yesod-json/1.2.0/yesod-json-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6b1b0f20e2ecdc6b626956f53e84d29d
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.1.0.1 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.1.0.1
index 367a1c5a71c0..b726368d7013 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/persistent-1.0:=[profile?] <dev-haskell/persistent-1.2:=[profile?] >=dev-haskell/persistent-template-1.0:=[profile?] <dev-haskell/persistent-template-1.2:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/yesod-core-1.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.1.0.1/yesod-persistent-1.1.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cad614bffc15ae54b71769becc168373
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.0
index 0f897bdfe4cd..eeb63b9ce936 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/lifted-base:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] =dev-haskell/persistent-template-1.2*:=[profile?] dev-haskell/pool-conduit:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.2.0/yesod-persistent-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bae54d6b370551d9f7ce1ca019b2956e
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.1 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.1
index 7cc99a7e08d6..34a01e74aa0e 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.1
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/lifted-base:=[profile?] =dev-haskell/persistent-1.2*:=[profile?] =dev-haskell/persistent-template-1.2*:=[profile?] dev-haskell/pool-conduit:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.2.1/yesod-persistent-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9c69141d3c176c3bc07a54d07d9f8c9e
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.2 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.2
index d7da25a70a62..78346fa3edfc 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.2
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?] >=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.3:=[profile?] dev-haskell/pool-conduit:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.2
 SRC_URI=mirror://hackage/packages/archive/yesod-persistent/1.2.2/yesod-persistent-1.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c3643ebed6890fa869148ea44d2edc7e
diff --git a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.4.2 b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.4.2
index acf6e68acef9..af21ffa3800e 100644
--- a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.4.2
+++ b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.6.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6:=[profile?] >=dev-haskell/asn1-data-0.7.1:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/attoparsec-conduit-1.0.1.2:=[profile?] >=dev-haskell/authenticate-1.3.2.6:=[profile?] >=dev-haskell/base-unicode-symbols-0.2.2.4:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3.1.1:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0.0:=[profile?] >=dev-haskell/blaze-html-0.6.1.1:=[profile?] >=dev-haskell/blaze-markup-0.5.1.5:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/byteorder-1.0.4:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] >=dev-haskell/cereal-0.3.5.2:=[profile?] >=dev-haskell/certificate-1.3.8:=[profile?] >=dev-haskell/cipher-aes-0.2.5:=[profile?] >=dev-haskell/cipher-rc4-0.1.2:=[profile?] >=dev-haskell/clientsession-0.9.0.3:=[profile?] >=dev-haskell/conduit-1.0.7.4:=[profile?] >=dev-haskell/cookie-0.4.0.1:=[profile?] >=dev-haskell/cprng-aes-0.5.2:=[profile?] >=dev-haskell/crypto-api-0.12.2.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.4:=[profile?] >=dev-haskell/crypto-conduit-0.5.2:=[profile?] >=dev-haskell/crypto-numbers-0.2.1:=[profile?] >=dev-haskell/crypto-pubkey-0.2.1:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.0:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] >=dev-haskell/cryptohash-0.10.0:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/data-default-instances-base-0.0.1:=[profile?] >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?] >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?] >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?] >=dev-haskell/date-cache-0.3.0:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] >=dev-haskell/email-validate-1.0.0:=[profile?] >=dev-haskell/entropy-0.2.2.2:=[profile?] >=dev-haskell/failure-0.2.0.1:=[profile?] >=dev-haskell/fast-logger-0.3.3:=[profile?] >=dev-haskell/file-embed-0.0.4.9:=[profile?] >=dev-haskell/filesystem-conduit-1.0.0.1:=[profile?] >=dev-haskell/hamlet-1.1.7.2:=[profile?] >=dev-haskell/hjsmin-0.1.4.1:=[profile?] >=dev-haskell/hspec-1.7.2:=[profile?] >=dev-haskell/hspec-expectations-0.3.3:=[profile?] >=dev-haskell/html-conduit-1.1.0:=[profile?] >=dev-haskell/http-attoparsec-0.1.0:=[profile?] >=dev-haskell/http-conduit-1.9.4.5:=[profile?] >=dev-haskell/http-date-0.0.4:=[profile?] >=dev-haskell/http-types-0.8.1:=[profile?] >=dev-haskell/language-javascript-0.5.7:=[profile?] >=dev-haskell/lifted-base-0.2.1.0:=[profile?] >=dev-haskell/mime-mail-0.4.2.1:=[profile?] >=dev-haskell/mime-types-0.1.0.3:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] >=dev-haskell/monad-control-0.3.2.1:=[profile?] >=dev-haskell/monad-logger-0.3.1.1:=[profile?] >=dev-haskell/network-conduit-1.0.0:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] >=dev-haskell/pem-0.1.2:=[profile?] >=dev-haskell/persistent-1.2.3.0:=[profile?] >=dev-haskell/persistent-template-1.2.0.2:=[profile?] >=dev-haskell/pool-conduit-0.1.2:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] >=dev-haskell/publicsuffixlist-0.1:=[profile?] >=dev-haskell/puremd5-2.1.2.1:=[profile?] >=dev-haskell/pwstore-fast-2.3:=[profile?] >=dev-haskell/quickcheck-io-0.1.0:=[profile?] >=dev-haskell/resource-pool-0.2.1.1:=[profile?] >=dev-haskell/resourcet-0.4.8:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] >=dev-haskell/securemem-0.1.3:=[profile?] >=dev-haskell/semigroups-0.9.2:=[profile?] >=dev-haskell/setenv-0.1.0:=[profile?] >=dev-haskell/sha-1.6.1:=[profile?] >=dev-haskell/shakespeare-1.2.0:=[profile?] >=dev-haskell/shakespeare-css-1.0.6.3:=[profile?] >=dev-haskell/shakespeare-i18n-1.0.0.4:=[profile?] >=dev-haskell/shakespeare-js-1.2.0:=[profile?] >=dev-haskell/shakespeare-text-1.0.0.7:=[profile?] >=dev-haskell/silently-1.2.4.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.12:=[profile?] >=dev-haskell/skein-1.0.6:=[profile?] >=dev-haskell/socks-0.5.1:=[profile?] >=dev-haskell/stringsearch-0.3.6.4:=[profile?] >=dev-haskell/system-fileio-0.3.11:=[profile?] >=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] >=dev-haskell/tagstream-conduit-0.5.4:=[profile?] >=dev-haskell/tls-1.1.5:=[profile?] >=dev-haskell/tls-extra-0.6.5:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] >=dev-haskell/unix-compat-0.4.1.1:=[profile?] >=dev-haskell/unordered-containers-0.2.3.2:=[profile?] >=dev-haskell/utf8-light-0.4.0.1:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] >=dev-haskell/wai-1.4.0.2:=[profile?] >=dev-haskell/wai-app-static-1.3.1.4:=[profile?] >=dev-haskell/wai-extra-1.3.4.4:=[profile?] >=dev-haskell/wai-logger-0.3.1:=[profile?] >=dev-haskell/wai-test-1.3.1.1:=[profile?] >=dev-haskell/warp-1.3.9.2:=[profile?] >=dev-haskell/word8-0.0.3:=[profile?] >=dev-haskell/xml-conduit-1.1.0.7:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] >=dev-haskell/xss-sanitize-0.3.4:=[profile?] >=dev-haskell/yaml-0.8.4.1:=[profile?] >=dev-haskell/yesod-1.2.2.1:=[profile?] >=dev-haskell/yesod-auth-1.2.2.1:=[profile?] >=dev-haskell/yesod-core-1.2.4.2:=[profile?] >=dev-haskell/yesod-form-1.3.2.1:=[profile?] >=dev-haskell/yesod-persistent-1.2.1:=[profile?] >=dev-haskell/yesod-routes-1.2.0.1:=[profile?] >=dev-haskell/yesod-static-1.2.0.1:=[profile?] >=dev-haskell/yesod-test-1.2.1:=[profile?] >=dev-haskell/zlib-bindings-0.1.1.3:=[profile?] >=dev-haskell/zlib-conduit-1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.4.2
 SRC_URI=mirror://hackage/packages/archive/yesod-platform/1.2.4.2/yesod-platform-1.2.4.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8fb569f2ba0515f4fd2113ef7a57e7e3
diff --git a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5 b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5
index 40516cf0b850..b9f1c7652c05 100644
--- a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5
+++ b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.6.2.1:=[profile?] >=dev-haskell/ansi-terminal-0.6:=[profile?] >=dev-haskell/asn1-data-0.7.1:=[profile?] >=dev-haskell/asn1-types-0.2.2:=[profile?] >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/attoparsec-conduit-1.0.1.2:=[profile?] >=dev-haskell/authenticate-1.3.2.6:=[profile?] >=dev-haskell/base-unicode-symbols-0.2.2.4:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3.3.2:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0.0:=[profile?] >=dev-haskell/blaze-html-0.6.1.2:=[profile?] >=dev-haskell/blaze-markup-0.5.1.6:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/byteorder-1.0.4:=[profile?] >=dev-haskell/case-insensitive-1.1.0.2:=[profile?] >=dev-haskell/cereal-0.4.0.1:=[profile?] >=dev-haskell/certificate-1.3.9:=[profile?] >=dev-haskell/cipher-aes-0.2.6:=[profile?] >=dev-haskell/cipher-rc4-0.1.4:=[profile?] >=dev-haskell/clientsession-0.9.0.3:=[profile?] >=dev-haskell/conduit-1.0.9.3:=[profile?] >=dev-haskell/connection-0.1.3.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] >=dev-haskell/cookie-0.4.0.1:=[profile?] >=dev-haskell/cprng-aes-0.5.2:=[profile?] >=dev-haskell/crypto-api-0.12.2.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?] >=dev-haskell/crypto-conduit-0.5.2.1:=[profile?] >=dev-haskell/crypto-numbers-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] >=dev-haskell/cryptohash-0.11.1:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/data-default-instances-base-0.0.1:=[profile?] >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?] >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?] >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?] >=dev-haskell/dlist-0.6.0.1:=[profile?] >=dev-haskell/email-validate-1.0.0:=[profile?] >=dev-haskell/entropy-0.2.2.4:=[profile?] >=dev-haskell/failure-0.2.0.1:=[profile?] >=dev-haskell/fast-logger-2.0.0:=[profile?] >=dev-haskell/file-embed-0.0.6:=[profile?] >=dev-haskell/filesystem-conduit-1.0.0.1:=[profile?] >=dev-haskell/hamlet-1.1.7.5:=[profile?] >=dev-haskell/hjsmin-0.1.4.4:=[profile?] >=dev-haskell/hspec-1.8.1.1:=[profile?] >=dev-haskell/hspec-expectations-0.5.0.1:=[profile?] >=dev-haskell/html-conduit-1.1.0.1:=[profile?] >=dev-haskell/http-attoparsec-0.1.0:=[profile?] >=dev-haskell/http-client-0.2.0.2:=[profile?] >=dev-haskell/http-client-conduit-0.2.0.0:=[profile?] >=dev-haskell/http-client-tls-0.2.0.0:=[profile?] >=dev-haskell/http-conduit-2.0.0.2:=[profile?] >=dev-haskell/http-date-0.0.4:=[profile?] >=dev-haskell/http-types-0.8.3:=[profile?] >=dev-haskell/language-javascript-0.5.8:=[profile?] >=dev-haskell/lifted-base-0.2.1.1:=[profile?] >=dev-haskell/mime-mail-0.4.2.1:=[profile?] >=dev-haskell/mime-types-0.1.0.3:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] >=dev-haskell/monad-control-0.3.2.2:=[profile?] >=dev-haskell/monad-logger-0.3.3.1:=[profile?] >=dev-haskell/monad-loops-0.4.2:=[profile?] >=dev-haskell/network-conduit-1.0.0:=[profile?] >=dev-haskell/path-pieces-0.1.3:=[profile?] >=dev-haskell/pem-0.2.1:=[profile?] >=dev-haskell/persistent-1.2.3.0:=[profile?] >=dev-haskell/persistent-template-1.2.0.5:=[profile?] >=dev-haskell/pool-conduit-0.1.2:=[profile?] >=dev-haskell/primitive-0.5.1.0:=[profile?] >=dev-haskell/process-conduit-1.0.0.1:=[profile?] >=dev-haskell/publicsuffixlist-0.1:=[profile?] >=dev-haskell/puremd5-2.1.2.1:=[profile?] >=dev-haskell/pwstore-fast-2.4.1:=[profile?] >=dev-haskell/quickcheck-io-0.1.0:=[profile?] >=dev-haskell/resource-pool-0.2.1.1:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] >=dev-haskell/securemem-0.1.3:=[profile?] >=dev-haskell/semigroups-0.12.1:=[profile?] >=dev-haskell/setenv-0.1.1:=[profile?] >=dev-haskell/sha-1.6.1:=[profile?] >=dev-haskell/shakespeare-1.2.0.3:=[profile?] >=dev-haskell/shakespeare-css-1.0.6.6:=[profile?] >=dev-haskell/shakespeare-i18n-1.0.0.5:=[profile?] >=dev-haskell/shakespeare-js-1.2.0.2:=[profile?] >=dev-haskell/shakespeare-text-1.0.0.10:=[profile?] >=dev-haskell/silently-1.2.4.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.13:=[profile?] >=dev-haskell/skein-1.0.8:=[profile?] >=dev-haskell/socks-0.5.4:=[profile?] >=dev-haskell/stm-chans-3.0.0:=[profile?] >=dev-haskell/stringsearch-0.3.6.5:=[profile?] >=dev-haskell/system-fileio-0.3.11:=[profile?] >=dev-haskell/system-filepath-0.4.8:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] >=dev-haskell/tagstream-conduit-0.5.4.1:=[profile?] >=dev-haskell/tls-1.1.5:=[profile?] >=dev-haskell/tls-extra-0.6.6:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] >=dev-haskell/unix-compat-0.4.1.1:=[profile?] >=dev-haskell/unordered-containers-0.2.3.3:=[profile?] >=dev-haskell/utf8-light-0.4.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-haskell/wai-app-static-2.0.0.1:=[profile?] >=dev-haskell/wai-extra-2.0.0.1:=[profile?] >=dev-haskell/wai-logger-2.0.1:=[profile?] >=dev-haskell/wai-test-2.0.0.1:=[profile?] >=dev-haskell/warp-2.0.0.1:=[profile?] >=dev-haskell/word8-0.0.4:=[profile?] >=dev-haskell/xml-conduit-1.1.0.9:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] >=dev-haskell/xss-sanitize-0.3.4:=[profile?] >=dev-haskell/yaml-0.8.5.2:=[profile?] >=dev-haskell/yesod-1.2.4:=[profile?] >=dev-haskell/yesod-auth-1.2.4:=[profile?] >=dev-haskell/yesod-core-1.2.6.1:=[profile?] >=dev-haskell/yesod-form-1.3.4:=[profile?] >=dev-haskell/yesod-persistent-1.2.2:=[profile?] >=dev-haskell/yesod-routes-1.2.0.2:=[profile?] >=dev-haskell/yesod-static-1.2.2:=[profile?] >=dev-haskell/yesod-test-1.2.1:=[profile?] >=dev-haskell/zlib-bindings-0.1.1.3:=[profile?] >=dev-haskell/zlib-conduit-1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5
 SRC_URI=mirror://hackage/packages/archive/yesod-platform/1.2.5/yesod-platform-1.2.5.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=487c3a61493ef20b84f03c594aa1368d
diff --git a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5.1 b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5.1
index a97c30b90f02..8f89d400fb4c 100644
--- a/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5.1
+++ b/metadata/md5-cache/dev-haskell/yesod-platform-1.2.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.6.2.1:=[profile?] >=dev-haskell/ansi-terminal-0.6:=[profile?] >=dev-haskell/asn1-data-0.7.1:=[profile?] >=dev-haskell/asn1-types-0.2.2:=[profile?] >=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/attoparsec-conduit-1.0.1.2:=[profile?] >=dev-haskell/authenticate-1.3.2.6:=[profile?] >=dev-haskell/base-unicode-symbols-0.2.2.4:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3.3.2:=[profile?] >=dev-haskell/blaze-builder-conduit-1.0.0:=[profile?] >=dev-haskell/blaze-html-0.6.1.2:=[profile?] >=dev-haskell/blaze-markup-0.5.1.6:=[profile?] >=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/byteorder-1.0.4:=[profile?] >=dev-haskell/case-insensitive-1.1.0.2:=[profile?] >=dev-haskell/cereal-0.4.0.1:=[profile?] >=dev-haskell/certificate-1.3.9:=[profile?] >=dev-haskell/cipher-aes-0.2.6:=[profile?] >=dev-haskell/cipher-rc4-0.1.4:=[profile?] >=dev-haskell/clientsession-0.9.0.3:=[profile?] >=dev-haskell/conduit-1.0.9.3:=[profile?] >=dev-haskell/connection-0.1.3.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] >=dev-haskell/cookie-0.4.0.1:=[profile?] >=dev-haskell/cprng-aes-0.5.2:=[profile?] >=dev-haskell/crypto-api-0.12.2.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?] >=dev-haskell/crypto-conduit-0.5.2.1:=[profile?] >=dev-haskell/crypto-numbers-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-0.2.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] >=dev-haskell/cryptohash-0.11.1:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/data-default-instances-base-0.0.1:=[profile?] >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?] >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?] >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?] >=dev-haskell/dlist-0.6.0.1:=[profile?] >=dev-haskell/email-validate-1.0.0:=[profile?] >=dev-haskell/entropy-0.2.2.4:=[profile?] >=dev-haskell/failure-0.2.0.1:=[profile?] >=dev-haskell/fast-logger-2.0.0:=[profile?] >=dev-haskell/file-embed-0.0.6:=[profile?] >=dev-haskell/filesystem-conduit-1.0.0.1:=[profile?] >=dev-haskell/hamlet-1.1.7.5:=[profile?] >=dev-haskell/hjsmin-0.1.4.4:=[profile?] >=dev-haskell/hspec-1.8.1.1:=[profile?] >=dev-haskell/hspec-expectations-0.5.0.1:=[profile?] >=dev-haskell/html-conduit-1.1.0.1:=[profile?] >=dev-haskell/http-attoparsec-0.1.0:=[profile?] >=dev-haskell/http-client-0.2.0.3:=[profile?] >=dev-haskell/http-client-conduit-0.2.0.0:=[profile?] >=dev-haskell/http-client-tls-0.2.0.0:=[profile?] >=dev-haskell/http-conduit-2.0.0.2:=[profile?] >=dev-haskell/http-date-0.0.4:=[profile?] >=dev-haskell/http-types-0.8.3:=[profile?] >=dev-haskell/language-javascript-0.5.8:=[profile?] >=dev-haskell/lifted-base-0.2.1.1:=[profile?] >=dev-haskell/mime-mail-0.4.2.1:=[profile?] >=dev-haskell/mime-types-0.1.0.3:=[profile?] >=dev-haskell/mmorph-1.0.0:=[profile?] >=dev-haskell/monad-control-0.3.2.2:=[profile?] >=dev-haskell/monad-logger-0.3.3.1:=[profile?] >=dev-haskell/monad-loops-0.4.2:=[profile?] >=dev-haskell/network-conduit-1.0.0:=[profile?] >=dev-haskell/path-pieces-0.1.3.1:=[profile?] >=dev-haskell/pem-0.2.1:=[profile?] >=dev-haskell/persistent-1.2.3.0:=[profile?] >=dev-haskell/persistent-template-1.2.0.6:=[profile?] >=dev-haskell/pool-conduit-0.1.2:=[profile?] >=dev-haskell/primitive-0.5.1.0:=[profile?] >=dev-haskell/process-conduit-1.0.0.1:=[profile?] >=dev-haskell/publicsuffixlist-0.1:=[profile?] >=dev-haskell/puremd5-2.1.2.1:=[profile?] >=dev-haskell/pwstore-fast-2.4.1:=[profile?] >=dev-haskell/quickcheck-io-0.1.0:=[profile?] >=dev-haskell/resource-pool-0.2.1.1:=[profile?] >=dev-haskell/resourcet-0.4.9:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] >=dev-haskell/securemem-0.1.3:=[profile?] >=dev-haskell/semigroups-0.12.1:=[profile?] >=dev-haskell/setenv-0.1.1:=[profile?] >=dev-haskell/sha-1.6.1:=[profile?] >=dev-haskell/shakespeare-1.2.0.3:=[profile?] >=dev-haskell/shakespeare-css-1.0.6.6:=[profile?] >=dev-haskell/shakespeare-i18n-1.0.0.5:=[profile?] >=dev-haskell/shakespeare-js-1.2.0.2:=[profile?] >=dev-haskell/shakespeare-text-1.0.0.10:=[profile?] >=dev-haskell/silently-1.2.4.1:=[profile?] >=dev-haskell/simple-sendfile-0.2.13:=[profile?] >=dev-haskell/skein-1.0.8:=[profile?] >=dev-haskell/socks-0.5.4:=[profile?] >=dev-haskell/stm-chans-3.0.0:=[profile?] >=dev-haskell/stringsearch-0.3.6.5:=[profile?] >=dev-haskell/system-fileio-0.3.11:=[profile?] >=dev-haskell/system-filepath-0.4.8:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] >=dev-haskell/tagstream-conduit-0.5.4.1:=[profile?] >=dev-haskell/tls-1.1.5:=[profile?] >=dev-haskell/tls-extra-0.6.6:=[profile?] >=dev-haskell/transformers-base-0.4.1:=[profile?] >=dev-haskell/unix-compat-0.4.1.1:=[profile?] >=dev-haskell/unordered-containers-0.2.3.3:=[profile?] >=dev-haskell/utf8-light-0.4.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] >=dev-haskell/vector-0.10.9.1:=[profile?] >=dev-haskell/void-0.6.1:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-haskell/wai-app-static-2.0.0.1:=[profile?] >=dev-haskell/wai-extra-2.0.0.1:=[profile?] >=dev-haskell/wai-logger-2.0.1:=[profile?] >=dev-haskell/wai-test-2.0.0.1:=[profile?] >=dev-haskell/warp-2.0.1:=[profile?] >=dev-haskell/word8-0.0.4:=[profile?] >=dev-haskell/xml-conduit-1.1.0.9:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] >=dev-haskell/xss-sanitize-0.3.4:=[profile?] >=dev-haskell/yaml-0.8.5.2:=[profile?] >=dev-haskell/yesod-1.2.4:=[profile?] >=dev-haskell/yesod-auth-1.2.4:=[profile?] >=dev-haskell/yesod-core-1.2.6.1:=[profile?] >=dev-haskell/yesod-form-1.3.4:=[profile?] >=dev-haskell/yesod-persistent-1.2.2:=[profile?] >=dev-haskell/yesod-routes-1.2.0.3:=[profile?] >=dev-haskell/yesod-static-1.2.2:=[profile?] >=dev-haskell/yesod-test-1.2.1:=[profile?] >=dev-haskell/zlib-bindings-0.1.1.3:=[profile?] >=dev-haskell/zlib-conduit-1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.1
 SRC_URI=mirror://hackage/packages/archive/yesod-platform/1.2.5.1/yesod-platform-1.2.5.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8ae8caaedf3b714d9d61f4cc260e62c1
diff --git a/metadata/md5-cache/dev-haskell/yesod-routes-1.1.2 b/metadata/md5-cache/dev-haskell/yesod-routes-1.1.2
index 90d1d48c0ad7..2c71ab0b2008 100644
--- a/metadata/md5-cache/dev-haskell/yesod-routes-1.1.2
+++ b/metadata/md5-cache/dev-haskell/yesod-routes-1.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/path-pieces-0.1*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.2
 SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.1.2/yesod-routes-1.1.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8ee078608553bdf91ad99cc76a2a71ad
diff --git a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0
index f68cc22720b0..a99ac19ccd4a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/path-pieces-0.1*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.2.0/yesod-routes-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f027f46fdf8137a5badcb704a573b60e
diff --git a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.1 b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.1
index e47385fafe29..3be53563265b 100644
--- a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-haskell/path-pieces-0.1*:=[profile?] >=dev-haskell/text-0.5:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.2.0.1/yesod-routes-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d2bb27e881ecbba260d6a5b23b62d26e
diff --git a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.2 b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.2
index aa6e46e4a906..3395a21876b7 100644
--- a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.2
+++ b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/path-pieces-0.1:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.2
 SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.2.0.2/yesod-routes-1.2.0.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6dce87f2037e373bb557a600ce57dd6e
diff --git a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.3 b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.3
index 65e72572433b..a7cc14c339d7 100644
--- a/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.3
+++ b/metadata/md5-cache/dev-haskell/yesod-routes-1.2.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/path-pieces-0.1:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/text-0.5:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.3
 SRC_URI=mirror://hackage/packages/archive/yesod-routes/1.2.0.3/yesod-routes-1.2.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f7d2513b81b09e261d9c0f39c2136b04
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.1.2.3 b/metadata/md5-cache/dev-haskell/yesod-static-1.1.2.3
index dfcdc6b6e496..f2e5e457ad65 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.1.2.3
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-0.6.1:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-app-static-1.3*:=[profile?] =dev-haskell/yesod-core-1.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.2.3
 SRC_URI=mirror://hackage/packages/archive/yesod-static/1.1.2.3/yesod-static-1.1.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8438f6b2cb834000332ec22729fe0de8
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-static-1.2.0
index 7733fc0659ef..b4a90be755b0 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-0.6.1:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/shakespeare-css-1.0.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] =dev-haskell/wai-app-static-1.3*:=[profile?] =dev-haskell/yesod-core-1.2*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/yesod-static/1.2.0/yesod-static-1.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e404692faaa7a32e3449c3f70f6ecb87
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.2.0.1 b/metadata/md5-cache/dev-haskell/yesod-static-1.2.0.1
index a92250f695dd..70b90b1fbac8 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/shakespeare-css-1.0.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?] >=dev-haskell/wai-app-static-1.3:=[profile?] <dev-haskell/wai-app-static-1.4:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0.1
 SRC_URI=mirror://hackage/packages/archive/yesod-static/1.2.0.1/yesod-static-1.2.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1f5b84abfabce45b819d73d165759aab
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.2.2 b/metadata/md5-cache/dev-haskell/yesod-static-1.2.2
index 22a9f3eec04c..cf12f9041861 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.2.2
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/crypto-conduit-0.4:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/process-conduit-1.0:=[profile?] <dev-haskell/process-conduit-1.1:=[profile?] >=dev-haskell/resourcet-0.4:=[profile?] >=dev-haskell/shakespeare-css-1.0.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-1.3.2:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.2
 SRC_URI=mirror://hackage/packages/archive/yesod-static/1.2.2/yesod-static-1.2.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=37ac0914f47125894fe4248e50de8732
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.2.1 b/metadata/md5-cache/dev-haskell/yesod-test-1.2.1
index c3e592f79062..5a2cc237fb6d 100644
--- a/metadata/md5-cache/dev-haskell/yesod-test-1.2.1
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-1.4:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/persistent-1.0:=[profile?] dev-haskell/pool-conduit:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-test-1.3:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.2.1
 SRC_URI=mirror://hackage/packages/archive/yesod-test/1.2.1/yesod-test-1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=fe3769e3c05b219ab547936f349b6291
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.6 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.6
index aa1d6ec64c15..adfe4a3d7cf2 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.6
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/binary >=dev-haskell/cabal-1.2 >=dev-haskell/digest-0.0.0.1 dev-haskell/mtl >=dev-haskell/utf8-string-0.3.1 dev-haskell/zlib
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.1.6/zip-archive-0.1.1.6.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f474b568e89512e6b4782f2bbf04b8d7
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.7 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.7
index 6be6a450db30..76fc15529171 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.7
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/binary >=dev-haskell/digest-0.0.0.1 dev-haskell/mtl >=dev-haskell/utf8-string-0.3.1 dev-haskell/zlib >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.1.7/zip-archive-0.1.1.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e65b5c1c829020e01cdd4c5c93911d06
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.8 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.8
index 64b37fb81e1a..abfbd6b8f8fd 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.8
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary[profile?] >=dev-haskell/digest-0.0.0.1[profile?] dev-haskell/mtl[profile?] >=dev-haskell/utf8-string-0.3.1[profile?] dev-haskell/zlib[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.1.8/zip-archive-0.1.1.8.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=27246ada40672cfd1ff883a8099d57ac
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.2.1-r2 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.2.1-r2
index 1946481dd9e4..4eff91fa8b85 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.2.1-r2
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.2.1/zip-archive-0.1.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2de82728511d70cabcc852167e580704
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
index 1e7adc698ec7..bb655b572ee5 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.1.3.4
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.3.4/zip-archive-0.1.3.4.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f6a598465f4335ce7945f9870ec568a7
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.3.3 b/metadata/md5-cache/dev-haskell/zlib-0.5.3.3
index 5d92e2ba90cc..819a1967393e 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.3.3
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.3.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/zlib/0.5.3.3/zlib-0.5.3.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ebedc2cf3a7f5b01292d9c503ed9ed2f
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.4.0 b/metadata/md5-cache/dev-haskell/zlib-0.5.4.0
index 6f84da0554ff..c53790905157 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.4.0
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.5.4.0
 SRC_URI=mirror://hackage/packages/archive/zlib/0.5.4.0/zlib-0.5.4.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6430b92874f1b6d99c34ad66e4289515
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.4.1 b/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
index 44e82c08632a..3e139f4d7ace 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.5.4.1
 SRC_URI=mirror://hackage/packages/archive/zlib/0.5.4.1/zlib-0.5.4.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=2f6a5645375ed79b9e586d1474facbad
diff --git a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.3 b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.3
index f272400c4a31..f1a0f228ba70 100644
--- a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.3
 SRC_URI=mirror://hackage/packages/archive/zlib-bindings/0.1.1.3/zlib-bindings-0.1.1.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa122e0a8d66aeed1a68761997c7ffcc
diff --git a/metadata/md5-cache/dev-haskell/zlib-conduit-1.0.0 b/metadata/md5-cache/dev-haskell/zlib-conduit-1.0.0
index c4a7e833d2fe..14330dda894e 100644
--- a/metadata/md5-cache/dev-haskell/zlib-conduit-1.0.0
+++ b/metadata/md5-cache/dev-haskell/zlib-conduit-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-haskell/conduit-1.0*:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] dev-haskell/void:=[profile?] =dev-haskell/zlib-bindings-0.1*:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.0
 SRC_URI=mirror://hackage/packages/archive/zlib-conduit/1.0.0/zlib-conduit-1.0.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c3fe710981455d334ce56b0d5c06efc1
diff --git a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3-r1 b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3-r1
index 058c95826109..24b5da7cb44c 100644
--- a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3-r1
+++ b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.3
 SRC_URI=mirror://hackage/packages/archive/zlib-enum/0.2.3/zlib-enum-0.2.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=0793854aef927c429f552976b9f03faf
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1 b/metadata/md5-cache/dev-java/asm-3.3.1
index 2ef0751e1aae..8329ee4ec891 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1
@@ -3,11 +3,11 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 DESCRIPTION=Bytecode manipulation framework for Java
 HOMEPAGE=http://asm.objectweb.org
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4252502bbe4c3a789bb0ef95b121e115
+_md5_=00e60010675123ac9d4578109559fffc
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index c7ca10cba840..4142d1a8267c 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -4,10 +4,10 @@ DESCRIPTION=JDBC Driver for PostgreSQL
 EAPI=5
 HOMEPAGE=http://jdbc.postgresql.org/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fd7fb14c832665bc28f658e505f6ce57
+_md5_=c7982feaadbfadc610e1aaab9a4630ce
diff --git a/metadata/md5-cache/dev-lang/epic-0.9.2 b/metadata/md5-cache/dev-lang/epic-0.9.2
index 72c3d9e7ddc8..316ad8093da2 100644
--- a/metadata/md5-cache/dev-lang/epic-0.9.2
+++ b/metadata/md5-cache/dev-lang/epic-0.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal dev-haskell/mtl[profile?] >=dev-libs/boehm-gc-7.0[threads] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/epic/0.9.2/epic-0.9.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=58bfffc6961c8a6e65f1352f59a1b623
diff --git a/metadata/md5-cache/dev-lang/epic-0.9.3 b/metadata/md5-cache/dev-lang/epic-0.9.3
index 2284dde351a7..2067f8da2fa9 100644
--- a/metadata/md5-cache/dev-lang/epic-0.9.3
+++ b/metadata/md5-cache/dev-lang/epic-0.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-libs/boehm-gc-7.0[threads] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.9.3
 SRC_URI=mirror://hackage/packages/archive/epic/0.9.3/epic-0.9.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=81c430dffbf6395361a4d7b312258a88
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 27b533ac4d8c..1dc8d04df638 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	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	f913ed18b57a2d3372c4291680454db4	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	f913ed18b57a2d3372c4291680454db4	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _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 28c3f5332b1c..f643e4c7fd0f 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	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	f913ed18b57a2d3372c4291680454db4	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion	f913ed18b57a2d3372c4291680454db4	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _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 55d452198563..9aa9add4e09a 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	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _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 bffbfccf7c4b..213d18ad827d 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	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=473411025994a59c41f98dac20d4d659
diff --git a/metadata/md5-cache/dev-lang/ghc-7.4.2 b/metadata/md5-cache/dev-lang/ghc-7.4.2
index 15121b104a88..9948a56c0d06 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-7.4.2
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.4.2
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.4.2-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.4.2-amd64-stable-glibc.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.4.2-ia64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.4.2-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.4.2-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.4.2-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.4.2-x86-stable-glibc.tbz2 ) )
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a00e94fc41b831570b1293c127ee0349
diff --git a/metadata/md5-cache/dev-lang/ghc-7.6.2 b/metadata/md5-cache/dev-lang/ghc-7.6.2
index b57ef9440053..1cad37ccc3f4 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.6.2
+++ b/metadata/md5-cache/dev-lang/ghc-7.6.2
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.6.2
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.2/ghc-7.6.2-src.tar.bz2 ) !ghcbootstrap? ( amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.2-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.6.2-ia64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.2-x86.tbz2 ) )
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6365b750b50cfb620ff8ef6f08b716d9
diff --git a/metadata/md5-cache/dev-lang/ghc-7.6.3 b/metadata/md5-cache/dev-lang/ghc-7.6.3
index cad39e8fc164..e96470ed03b9 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.6.3
+++ b/metadata/md5-cache/dev-lang/ghc-7.6.3
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.6.3
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.3/ghc-7.6.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.6.3-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.6.3-ia64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.3-x86.tbz2 ) )
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=06b2c2c2440a12076aaea3ec82b8476a
diff --git a/metadata/md5-cache/dev-lang/ghc-7.6.3-r1 b/metadata/md5-cache/dev-lang/ghc-7.6.3-r1
index d65356b6de11..ec1c63d295fd 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.6.3-r1
+++ b/metadata/md5-cache/dev-lang/ghc-7.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/b
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.6.3
 SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.3/ghc-7.6.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.6.3-r1-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.6.3-r1-ia64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.6.3-r1-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.6.3-r1-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.6.3-r1-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.3-x86.tbz2 ) )
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	ghc-package	419a74a0fe876385690dfe3c4281bac7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d0cc1b82057b2534f530692dd21785f1
diff --git a/metadata/md5-cache/dev-lang/perl-5.16.3 b/metadata/md5-cache/dev-lang/perl-5.16.3
index 602cd6afe0e3..45e0c4b6ad87 100644
--- a/metadata/md5-cache/dev-lang/perl-5.16.3
+++ b/metadata/md5-cache/dev-lang/perl-5.16.3
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=5
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~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=|| ( Artistic GPL-1+ )
 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/5.16
 SRC_URI=mirror://cpan/src/perl-5.16.3.tar.bz2 mirror://cpan/authors/id/R/RJ/RJBS/perl-5.16.3.tar.bz2 mirror://gentoo/perl-5.16.3-1.tar.bz2 http://dev.gentoo.org/~tove/distfiles/dev-lang/perl/perl-5.16.3-1.tar.bz2
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=460cfa51b7c39b310c99278e443d072f
+_md5_=03e4c1a5646c1afaa47809dfe5ff98b4
diff --git a/metadata/md5-cache/dev-lang/perl-5.18.1 b/metadata/md5-cache/dev-lang/perl-5.18.1
index 594866ad2ca2..f24c831f8226 100644
--- a/metadata/md5-cache/dev-lang/perl-5.18.1
+++ b/metadata/md5-cache/dev-lang/perl-5.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=5
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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=|| ( Artistic GPL-1+ )
 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/5.18
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/perl-5.18.1.tar.bz2
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f81832d6b002b19cf405442b1046baa9
+_md5_=e38e6aef64166083062ac5fe5cbd8bcd
diff --git a/metadata/md5-cache/dev-lang/python-3.3.3 b/metadata/md5-cache/dev-lang/python-3.3.3
index 41033eda9167..120b8b34c4f6 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.3
+++ b/metadata/md5-cache/dev-lang/python-3.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
 IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 app-arch/xz-utils >=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 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 )
 SLOT=3.3
 SRC_URI=http://www.python.org/ftp/python/3.3.3/Python-3.3.3.tar.xz http://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.3-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.3-0.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8f86a617c4c0e8c7387ec17b5df39873
+_md5_=b9e0ab4d3a483173da8c03db159f17b4
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.13-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
index a82e2a38d533..0b907b692468 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.13-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install postinst prepare setup
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Tool Command Language
 EAPI=4
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.13-src.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6b875ea0671f91a44634e5dbfdebe49f
+_md5_=53d411427677024d6eb94a29cb53ddf8
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.14 b/metadata/md5-cache/dev-lang/tcl-8.5.14
deleted file mode 100644
index 149162f7045b..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.5.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tool Command Language
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-SLOT=0
-SRC_URI=mirror://sourceforge/tcl/tcl8.5.14-src.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=034b46f46df4cb21e49b999d60a793b6
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.15 b/metadata/md5-cache/dev-lang/tcl-8.5.15
deleted file mode 100644
index 3658852e91ee..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.5.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tool Command Language
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-SLOT=0
-SRC_URI=mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=dd64fb5923570bfe442cda1647bd3cb2
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.15-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
index 8cc5548b72c8..56450e7bb005 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
+DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=180f26ad5c9e1ccc073265e50ed67c33
+_md5_=debb3e320ba8f3ee0c09a173e39daae7
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.0-r1 b/metadata/md5-cache/dev-lang/tcl-8.6.0-r1
deleted file mode 100644
index cf7d71a16f88..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.6.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tool Command Language
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.0-src.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=29b5961e3be6576c7897c69ba2713208
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.1 b/metadata/md5-cache/dev-lang/tcl-8.6.1
deleted file mode 100644
index 1a32cec60d82..000000000000
--- a/metadata/md5-cache/dev-lang/tcl-8.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tool Command Language
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug +threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=tcltk
-SLOT=0/8.6
-SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.1-src.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bc4cb910157a540802442dda6ee7ce71
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.1-r1 b/metadata/md5-cache/dev-lang/tcl-8.6.1-r1
index 25d088964f6b..0611600eed81 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.1-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.1-src.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=59e1aadebb38a3b00eb0df997f53ab08
+_md5_=00b3efbb4839236b83b2bcf0ed9e1446
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.3 b/metadata/md5-cache/dev-lang/whitespace-0.3
index 338c9a60bb4f..0923e0c4a841 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.3
+++ b/metadata/md5-cache/dev-lang/whitespace-0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://compsoc.dur.ac.uk/whitespace/downloads/wspace-0.3.tgz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4986a66aaab3a5aa45b1cee610d87461
diff --git a/metadata/md5-cache/dev-libs/check-0.9.10 b/metadata/md5-cache/dev-libs/check-0.9.10
index fe222703974c..9944463baefd 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.10
+++ b/metadata/md5-cache/dev-libs/check-0.9.10
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.10.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d9e7d77ff4f52512d753fac27ada63c3
+_md5_=d5246f927ddff3de262cdbcfb7dc7874
diff --git a/metadata/md5-cache/dev-libs/check-0.9.11 b/metadata/md5-cache/dev-libs/check-0.9.11
index c8823a12e3b5..e947ab9b5d85 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.11
+++ b/metadata/md5-cache/dev-libs/check-0.9.11
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.11.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7eb54b1651e00368c0b8cae43e7014ff
+_md5_=24a10cde10c51366a9b36408826ffe07
diff --git a/metadata/md5-cache/dev-libs/check-0.9.8-r1 b/metadata/md5-cache/dev-libs/check-0.9.8-r1
index 568bddb6b096..ce74a4d5ef95 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.8-r1
+++ b/metadata/md5-cache/dev-libs/check-0.9.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~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 arm64 hppa ia64 m68k ~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=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.8.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=22cfc0f7a32c2d8b8ac093a55137e77b
+_md5_=6e3359b7afd16bae79f9feb8102fb5ca
diff --git a/metadata/md5-cache/dev-libs/check-0.9.9 b/metadata/md5-cache/dev-libs/check-0.9.9
index 78979d4a8c89..b3d02f3a8d00 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.9
+++ b/metadata/md5-cache/dev-libs/check-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~arm64 ~hppa ~ia64 ~m68k ~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=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.9.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=88ce445bb6eea65e198ae1dbc990728d
+_md5_=886657e1a5fab432087dad63b25ea991
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1 b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
index f52e1eb63d29..5e3e33a59f6d 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/
 IUSE=doc mono static-libs vala
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.19.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3595a163664090705a17889fc73c80e6
+_md5_=c61ace18ac586264b8359657d326da31
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_pre20130121 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_pre20130121
index 0206966abd5d..5255b7985b6d 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_pre20130121
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_pre20130121
@@ -4,10 +4,10 @@ DESCRIPTION=A multi-platform library for USB and Bluetooth HID-Class devices
 EAPI=4
 HOMEPAGE=http://www.signal11.us/oss/hidapi/
 IUSE=doc static-libs X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=http://public.callutheran.edu/~abarker/hidapi-0.8.0_pre20130121.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=646a032a2c4c923b0e737cabea1ba7ae
+_md5_=7c537328d185d10bd88fc15b747468aa
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.90-r1 b/metadata/md5-cache/dev-libs/libcdio-0.90-r1
index 61534aadc533..6c78e02f48e5 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.90-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-0.90-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7 cddb? ( >=media-libs/libcddb-1.3.2 ) ) virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-0.90.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4c80efc315d3f301265b94916bb006c5
+_md5_=aa84cd72b9ee75b5a254e3bcbeb1445f
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
index 7eb71c7d17a2..2986703b3599 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libcdio/
 IUSE=+cxx static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-admin/eselect-cdparanoia >=dev-libs/libcdio-0.90 virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.90+1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3c0eae9c8de81eb278dc6396e76d1cc3
+_md5_=0e2d22e124042713068ca1d2ee085166
diff --git a/metadata/md5-cache/dev-libs/libmirage-2.1.1 b/metadata/md5-cache/dev-libs/libmirage-2.1.1
index 784bf358c23d..4f8c380bc750 100644
--- a/metadata/md5-cache/dev-libs/libmirage-2.1.1
+++ b/metadata/md5-cache/dev-libs/libmirage-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=CD and DVD image access library
 EAPI=5
 HOMEPAGE=http://cdemu.org
 IUSE=doc +introspection
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.24:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/cdemu/libmirage-2.1.1.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6393a5549010f4de11a04789487504b3
+_md5_=a481b986f38567b92c23859646443b92
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
index 8f3c31c2c499..520f5fa90818 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
@@ -4,10 +4,10 @@ DESCRIPTION=library to smooth charset/localization issues
 EAPI=2
 HOMEPAGE=http://natspec.sourceforge.net/
 IUSE=doc python
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=python? ( >=dev-lang/python-2.3 ) dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0fb9c0299ae93ac95d2a3ea0530ee353
+_md5_=90ad1b7c50cf192198f7fa120533416b
diff --git a/metadata/md5-cache/dev-libs/mini-xml-2.8 b/metadata/md5-cache/dev-libs/mini-xml-2.8
new file mode 100644
index 000000000000..e8690bf31675
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mini-xml-2.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Small XML parsing library to read XML and XML-like data files
+EAPI=5
+HOMEPAGE=http://www.minixml.org/
+IUSE=threads static-libs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Mini-XML
+SLOT=0
+SRC_URI=http://www.msweet.org/files/project3/mxml-2.8.tar.gz
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=54fa5f820852174a970d4b23d26313e3
diff --git a/metadata/md5-cache/dev-libs/nss-3.15.4 b/metadata/md5-cache/dev-libs/nss-3.15.4
index 78ada7401358..9322977860b0 100644
--- a/metadata/md5-cache/dev-libs/nss-3.15.4
+++ b/metadata/md5-cache/dev-libs/nss-3.15.4
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=utils
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.10 >=dev-db/sqlite-3.5 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/nss-3.15.4.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ae61c3b1619169f34152cb3b7256679f
+_md5_=20d82f387ae122106ea7504ec72e41a4
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1f b/metadata/md5-cache/dev-libs/openssl-1.0.1f
index a5cbdd690239..62e0987fec51 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1f
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1f
@@ -4,11 +4,11 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=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.1f.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4285ca97572275bbef26cdc7393b9229
+_md5_=9b2cec9a0b9ef1e4bd80083377ecc66c
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0 b/metadata/md5-cache/dev-libs/protobuf-2.5.0
index 9f86b52e56c4..0ea9e09c4d35 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu
 EAPI=5
 HOMEPAGE=http://code.google.com/p/protobuf/
 IUSE=emacs examples java python static-libs vim-syntax python_targets_python2_6 python_targets_python2_7 elibc_FreeBSD source java
-KEYWORDS=amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos
+KEYWORDS=amd64 ~arm ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	distutils-r1	364122897f9dc771167ee5ff362e54e1	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6332b01b90575462a4eb9a55e7db6820
+_md5_=ffd581cf99b755e4dc6895fb6e74eaf1
diff --git a/metadata/md5-cache/dev-libs/vc-0.7.2 b/metadata/md5-cache/dev-libs/vc-0.7.2
index 379012595754..094d20157453 100644
--- a/metadata/md5-cache/dev-libs/vc-0.7.2
+++ b/metadata/md5-cache/dev-libs/vc-0.7.2
@@ -4,9 +4,9 @@ DESCRIPTION=A library to ease explicit vectorization of C++ code
 EAPI=5
 HOMEPAGE=http://code.compeng.uni-frankfurt.de/projects/vc
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-0.7.2-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-0.7.2-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-0.7.2-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-0.7.2-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-0.7.2-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-0.7.2-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-0.7.2-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-0.7.2-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-0.7.2-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-0.7.2-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-0.7.2-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-0.7.2-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-0.7.2-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-0.7.2-reference-sincos-sp.dat ) https://gitorious.org/vc/vc/archive-tarball/0.7.2 -> vc-0.7.2.tar.gz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=f12ba1faa721a04599a0f43412e6f6f1
+_md5_=39567b2ab6864a79ea180695365bb326
diff --git a/metadata/md5-cache/dev-ml/async-109.60.00 b/metadata/md5-cache/dev-ml/async-109.60.00
new file mode 100644
index 000000000000..06a37bdabe85
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/async-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/async_unix-109.60.00:= >=dev-ml/async_extra-109.60.00:= test? ( >=dev-ml/ounit-1.0.2 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street Capital's asynchronous execution library
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=examples +ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/async_unix-109.60.00:= >=dev-ml/async_extra-109.60.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/async-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/async-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d7eb227f656bd99898aac4ef022a478d
diff --git a/metadata/md5-cache/dev-ml/async_extra-109.60.00 b/metadata/md5-cache/dev-ml/async_extra-109.60.00
new file mode 100644
index 000000000000..b0d2c53f4f09
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/async_extra-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/pa_ounit-109.18.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/core-109.60.00:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/async_unix-109.60.00:= dev-ml/custom_printf:= dev-ml/herelib:= dev-ml/pa_test:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street Capital's asynchronous execution library (extra)
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/pa_ounit-109.18.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/core-109.60.00:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/async_unix-109.60.00:= dev-ml/custom_printf:= dev-ml/herelib:= dev-ml/pa_test:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/async_extra-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/async_extra-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=30f31fb1f0363a00005ea0f27bf0182d
diff --git a/metadata/md5-cache/dev-ml/async_kernel-109.60.00 b/metadata/md5-cache/dev-ml/async_kernel-109.60.00
new file mode 100644
index 000000000000..1e6c2a593e4e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/async_kernel-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/core-109.35.00:= >=dev-ml/herelib-109.35.00:= dev-ml/pa_test:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street Capital's asynchronous execution library (core)
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/core-109.35.00:= >=dev-ml/herelib-109.35.00:= dev-ml/pa_test:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/async_kernel-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a4e9c17ed7b9ad0689e8357b75603fba
diff --git a/metadata/md5-cache/dev-ml/async_unix-109.60.00 b/metadata/md5-cache/dev-ml/async_unix-109.60.00
new file mode 100644
index 000000000000..c27852cfdf0e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/async_unix-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/herelib-109.15.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/core-109.60.00:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/fieldslib-109.20.00:= dev-ml/pa_test:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street Capital's asynchronous execution library (unix)
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/herelib-109.15.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/core-109.60.00:= >=dev-ml/async_kernel-109.60.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/fieldslib-109.20.00:= dev-ml/pa_test:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/async_unix-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/async_unix-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=549e25f0d9f61163786b718e0275892c
diff --git a/metadata/md5-cache/dev-ml/bin-prot-109.53.02 b/metadata/md5-cache/dev-ml/bin-prot-109.53.02
new file mode 100644
index 000000000000..8cf53b108da7
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/bin-prot-109.53.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.28.00:= test? ( >=dev-ml/ounit-1.1.2 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=A binary protocol generator
+EAPI=5
+HOMEPAGE=http://ocaml.janestreet.com/?q=node/13
+IUSE=doc +ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.28.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.53.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.53.00/individual/bin_prot-109.53.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/bin_prot-109.53.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=332bef309d5c10136048de678e98211e
diff --git a/metadata/md5-cache/dev-ml/comparelib-109.60.00 b/metadata/md5-cache/dev-ml/comparelib-109.60.00
new file mode 100644
index 000000000000..4415db9aaa5c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/comparelib-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Camlp4 syntax extension that derives comparison functions from type representations
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/comparelib-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/comparelib-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=fc391fc4bb2abc43986df9992ed22a4f
diff --git a/metadata/md5-cache/dev-ml/core-109.60.00 b/metadata/md5-cache/dev-ml/core-109.60.00
new file mode 100644
index 000000000000..3e9b8596ed8d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/core_kernel-109.35.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/variantslib-109.15.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/herelib-109.35.00:= >=dev-ml/pipebang-109.15.00:= dev-ml/pa_bench:= dev-ml/pa_test:= test? ( >=dev-ml/ounit-1.1.2 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street's alternative to the standard library
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/core_kernel-109.35.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/variantslib-109.15.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/herelib-109.35.00:= >=dev-ml/pipebang-109.15.00:= dev-ml/pa_bench:= dev-ml/pa_test:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/core-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ae2799852184fb63980e1a5f8a21f3d5
diff --git a/metadata/md5-cache/dev-ml/core_extended-109.58.00 b/metadata/md5-cache/dev-ml/core_extended-109.58.00
new file mode 100644
index 000000000000..66a134314c16
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core_extended-109.58.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/core-109.58.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/custom_printf-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/textutils-109.35.00:= dev-ml/pa_test:= dev-ml/re2:= test? ( >=dev-ml/ounit-1.1.0 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Jane Street's alternative to the standard library
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/core-109.58.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/bin-prot-109.15.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/custom_printf-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/textutils-109.35.00:= dev-ml/pa_test:= dev-ml/re2:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.58.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.58.00/individual/core_extended-109.58.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/core_extended-109.58.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3e2e6c48808d1716e50e0e244eba2a31
diff --git a/metadata/md5-cache/dev-ml/core_kernel-109.60.00 b/metadata/md5-cache/dev-ml/core_kernel-109.60.00
new file mode 100644
index 000000000000..0b19c9592f77
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core_kernel-109.60.00
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/bin-prot-109.53.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/herelib-109.35.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/variantslib-109.15.00:= dev-ml/pa_bench:= dev-ml/typerep:= !dev-ml/zero test? ( dev-ml/pa_ounit >=dev-ml/core-109.60.00 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=System-independent part of Core
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/bin-prot-109.53.00:= >=dev-ml/comparelib-109.27.00:= >=dev-ml/fieldslib-109.20.00:= >=dev-ml/herelib-109.35.00:= >=dev-ml/pa_ounit-109.27.00:= >=dev-ml/pipebang-109.15.00:= >=dev-ml/sexplib-109.20.00:= >=dev-ml/variantslib-109.15.00:= dev-ml/pa_bench:= dev-ml/typerep:= !dev-ml/zero >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/core_kernel-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/core_kernel-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8f765c76f546f69e9f84f9b393b2a606
diff --git a/metadata/md5-cache/dev-ml/custom_printf-109.60.00 b/metadata/md5-cache/dev-ml/custom_printf-109.60.00
new file mode 100644
index 000000000000..088a56a431e5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/custom_printf-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension for printf format strings
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/custom_printf-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/custom_printf-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ddd60ec0c2d9b2a4f6f207bd62f33310
diff --git a/metadata/md5-cache/dev-ml/faillib-109.60.00 b/metadata/md5-cache/dev-ml/faillib-109.60.00
new file mode 100644
index 000000000000..8e70db71d3f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/faillib-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-ml/herelib:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension for inserting the current location
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/herelib:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/faillib-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0c53060ce88fb4623c5a5d7b6e4bbf3b
diff --git a/metadata/md5-cache/dev-ml/fieldslib-109.20.02 b/metadata/md5-cache/dev-ml/fieldslib-109.20.02
new file mode 100644
index 000000000000..279c9d1c6890
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/fieldslib-109.20.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.20.02:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Folding over record fields
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.20.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.20.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/fieldslib-109.20.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=6921a52a7afaa6219ee365027d4e04b6
diff --git a/metadata/md5-cache/dev-ml/herelib-109.35.02 b/metadata/md5-cache/dev-ml/herelib-109.35.02
new file mode 100644
index 000000000000..11233c1718e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/herelib-109.35.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension for inserting the current location
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.00.0:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.35.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.35.00/individual/herelib-109.35.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=35384013481d228fbac8e75c1fe69cca
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.1 b/metadata/md5-cache/dev-ml/oasis-0.4.1
new file mode 100644
index 000000000000..33303823e52b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/oasis-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= >=dev-ml/findlib-1.3.1 dev-ml/ocamlify dev-ml/ocamlmod !<sci-chemistry/oasis-4.0-r3 test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-2.0.0 >=dev-ml/ocaml-expect-0.0.4 dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=OASIS is a tool to integrate a configure, build and install system in OCaml project
+EAPI=5
+HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.4.1
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=17641d86bc2d85fa301f55cd8bae8954
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-2.0.5 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-2.0.5
new file mode 100644
index 000000000000..b6f3c4d72665
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-2.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=A package for ocaml that provides access to SQLite databases.
+EAPI=5
+HOMEPAGE=http://bitbucket.org/mmottl/sqlite3-ocaml
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/2.0.5
+SRC_URI=http://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-2.0.5.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=eb328b46701e6ba7ef4073158926549f
diff --git a/metadata/md5-cache/dev-ml/pa_bench-109.55.02 b/metadata/md5-cache/dev-ml/pa_bench-109.55.02
new file mode 100644
index 000000000000..fd4604cd4031
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pa_bench-109.55.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/pa_ounit:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension writing inline benchmarks
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/pa_ounit:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.55.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.55.00/individual/pa_bench-109.55.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/pa_bench-109.55.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c09a58e36629b81734e7206030096411
diff --git a/metadata/md5-cache/dev-ml/pa_ounit-109.53.02 b/metadata/md5-cache/dev-ml/pa_ounit-109.53.02
new file mode 100644
index 000000000000..27b0c566598e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pa_ounit-109.53.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/ounit-1.1.1:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension that helps writing in-line test in ocaml
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/ounit-1.1.1:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.53.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.53.00/individual/pa_ounit-109.53.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/pa_ounit-109.53.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a0ec72ece0b1522ff72af5098b76c0b7
diff --git a/metadata/md5-cache/dev-ml/pa_test-109.53.02 b/metadata/md5-cache/dev-ml/pa_test-109.53.02
new file mode 100644
index 000000000000..7e26cae3f63f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pa_test-109.53.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.53.02:= dev-ml/sexplib:= >=dev-ml/core_kernel-109.60.00:= dev-ml/comparelib:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Quotation expanders for assertions
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.53.02:= dev-ml/sexplib:= >=dev-ml/core_kernel-109.60.00:= dev-ml/comparelib:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.53.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.53.00/individual/pa_test-109.53.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=463b6ec59d09e4bb53eceb9681826ff9
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.0.4 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.0.4
new file mode 100644
index 000000000000..40b55ab5890d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
+EAPI=5
+HOMEPAGE=http://bitbucket.org/mmottl/pcre-ocaml
+IUSE=examples +ocamlopt debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/7.0.4
+SRC_URI=http://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e69fc980d2694d648a92630c75ef84b3
diff --git a/metadata/md5-cache/dev-ml/pipebang-109.60.00 b/metadata/md5-cache/dev-ml/pipebang-109.60.00
new file mode 100644
index 000000000000..1269988b70fc
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pipebang-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.60.00:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Syntax extension to transform x |! f into f x
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/type-conv-109.60.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/pipebang-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/pipebang-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=85ab7defbecda6ea0d31ddc6d6cd54b1
diff --git a/metadata/md5-cache/dev-ml/pomap-3.0.1 b/metadata/md5-cache/dev-ml/pomap-3.0.3
similarity index 81%
rename from metadata/md5-cache/dev-ml/pomap-3.0.1
rename to metadata/md5-cache/dev-ml/pomap-3.0.3
index 388d78ecdd3a..d56ecc913848 100644
--- a/metadata/md5-cache/dev-ml/pomap-3.0.1
+++ b/metadata/md5-cache/dev-ml/pomap-3.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Partially Ordered Map ADT for O'Caml
 EAPI=5
 HOMEPAGE=http://bitbucket.org/mmottl/pomap
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/3.0.1
-SRC_URI=http://bitbucket.org/mmottl/pomap/downloads/pomap-3.0.1.tar.gz
+SLOT=0/3.0.3
+SRC_URI=http://bitbucket.org/mmottl/pomap/downloads/pomap-3.0.3.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8406bd3e8adc764984493896679a6b4e
+_md5_=0108325b542fe071497d92ba8ee5d510
diff --git a/metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.2 b/metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.5
similarity index 87%
rename from metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.2
rename to metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.5
index f7020757f9f5..ffd45f8ac40c 100644
--- a/metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.2
+++ b/metadata/md5-cache/dev-ml/postgresql-ocaml-2.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases.
 EAPI=5
 HOMEPAGE=http://bitbucket.org/mmottl/postgresql-ocaml
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql-base dev-db/postgresql-server >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.0.2
-SRC_URI=http://bitbucket.org/mmottl/postgresql-ocaml/downloads/postgresql-ocaml-2.0.2.tar.gz
+SLOT=0/2.0.5
+SRC_URI=http://bitbucket.org/mmottl/postgresql-ocaml/downloads/postgresql-ocaml-2.0.5.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3d17dbcf3fd64d68be43090c4fd3269a
+_md5_=871205af5b0e122b40044e6d3add8788
diff --git a/metadata/md5-cache/dev-ml/re2-109.55.02 b/metadata/md5-cache/dev-ml/re2-109.55.02
new file mode 100644
index 000000000000..07d76a299106
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/re2-109.55.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/core:= dev-ml/bin-prot:= dev-ml/sexplib:= dev-ml/comparelib:= dev-libs/re2:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=OCaml bindings for RE2
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/core:= dev-ml/bin-prot:= dev-ml/sexplib:= dev-ml/comparelib:= dev-libs/re2:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.55.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.55.00/individual/re2-109.55.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1789f92633a765b40eab3d6990134eb8
diff --git a/metadata/md5-cache/dev-ml/res-4.0.2 b/metadata/md5-cache/dev-ml/res-4.0.4
similarity index 81%
rename from metadata/md5-cache/dev-ml/res-4.0.2
rename to metadata/md5-cache/dev-ml/res-4.0.4
index c0714f1fbec7..475ae1bfa560 100644
--- a/metadata/md5-cache/dev-ml/res-4.0.2
+++ b/metadata/md5-cache/dev-ml/res-4.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Resizable Array and Buffer modules for O'Caml
 EAPI=5
 HOMEPAGE=http://bitbucket.org/mmottl/res
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=amd64 ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/4.0.2
-SRC_URI=https://bitbucket.org/mmottl/res/downloads/res-4.0.2.tar.gz
+SLOT=0/4.0.4
+SRC_URI=https://bitbucket.org/mmottl/res/downloads/res-4.0.4.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=48cd2bb7459ac777b15611db54beabc3
+_md5_=4ab10cbfd4dd9e79d41583e35223ef5b
diff --git a/metadata/md5-cache/dev-ml/sexplib-109.60.00 b/metadata/md5-cache/dev-ml/sexplib-109.60.00
new file mode 100644
index 000000000000..0a04c9e10085
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.60.00:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-ml/type-conv-109.60.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/sexplib-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/sexplib-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c537b246d2826a268ab815ed6ab7effa
diff --git a/metadata/md5-cache/dev-ml/textutils-109.53.02 b/metadata/md5-cache/dev-ml/textutils-109.53.02
new file mode 100644
index 000000000000..4a05b5a196e8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/textutils-109.53.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/core-109.24.00:= >=dev-ml/pa_ounit-109.18.00:= >=dev-ml/sexplib-109.20.00:= dev-ml/async:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Text output utilities
+EAPI=5
+HOMEPAGE=https://ocaml.janestreet.com/
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/core-109.24.00:= >=dev-ml/pa_ounit-109.18.00:= >=dev-ml/sexplib-109.20.00:= dev-ml/async:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.53.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.53.00/individual/textutils-109.53.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=025a555a486946a62bf7140f9b84d420
diff --git a/metadata/md5-cache/dev-ml/type-conv-109.60.00 b/metadata/md5-cache/dev-ml/type-conv-109.60.00
new file mode 100644
index 000000000000..8a6466559db9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/type-conv-109.60.00
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lang/ocaml-4.0[ocamlopt?] >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Mini library required for some other preprocessing libraries
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.60.00
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/type_conv-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/type_conv-109.60.00.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=457466f3d75ed1f24742d7a97941910c
diff --git a/metadata/md5-cache/dev-ml/typerep-109.55.02 b/metadata/md5-cache/dev-ml/typerep-109.55.02
new file mode 100644
index 000000000000..3dc669451480
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/typerep-109.55.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/sexplib:= dev-ml/bin-prot:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Library for creating runtime representation of OCaml types
+EAPI=5
+HOMEPAGE=http://www.janestreet.com/ocaml
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/type-conv-109.55.02:= dev-ml/sexplib:= dev-ml/bin-prot:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.55.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.55.00/individual/typerep-109.55.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/typerep-109.55.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d3d4972981498177439a630ccf0bf949
diff --git a/metadata/md5-cache/dev-ml/variantslib-109.15.02 b/metadata/md5-cache/dev-ml/variantslib-109.15.02
new file mode 100644
index 000000000000..1aada18701bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/variantslib-109.15.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/type-conv-109.15.02:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=OCaml variants as first class values
+EAPI=5
+HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/type-conv-109.15.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/109.15.02
+SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.15.00/individual/variantslib-109.15.02.tar.gz http://dev.gentoo.org/~aballier/distfiles/variantslib-109.15.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=456b44e89028355c16477e87b8d171d2
diff --git a/metadata/md5-cache/dev-perl/Clone-0.350.0 b/metadata/md5-cache/dev-perl/Clone-0.350.0
index 2819455ce082..c0f7bb47bac1 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.350.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.350.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Recursively copy Perl datatypes
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Clone/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.35.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0d3cde82c119eeb0a091ea803a09965b
+_md5_=3e65cb0420186d9424c75080fe732c78
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.123.0 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.123.0
index 3e98f6111b2d..5caaeb2ec330 100644
--- a/metadata/md5-cache/dev-perl/Convert-BinHex-1.123.0
+++ b/metadata/md5-cache/dev-perl/Convert-BinHex-1.123.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Extract data from Macintosh BinHex files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Convert-BinHex/
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-1
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.123.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d0716aad2431ddb4b86e960c71e84829
+_md5_=aa67b7986eaab5ebba4264f8cee4e092
diff --git a/metadata/md5-cache/dev-perl/Devel-Symdump-2.100.0 b/metadata/md5-cache/dev-perl/Devel-Symdump-2.100.0
index 01b1591b372b..ab19baab90a1 100644
--- a/metadata/md5-cache/dev-perl/Devel-Symdump-2.100.0
+++ b/metadata/md5-cache/dev-perl/Devel-Symdump-2.100.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Dump symbol names or the symbol table
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Devel-Symdump/
-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 ~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 ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.10.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1689aabf9b6040e14c4e0f6e1143c331
+_md5_=8c4541f26d2816ef1de7b22c3d487c9b
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.500.0 b/metadata/md5-cache/dev-perl/Digest-MD4-1.500.0
deleted file mode 100644
index 586ed7b384be..000000000000
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.500.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=MD4 message digest algorithm
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Digest-MD4/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=831e08c88cc51ed85bf485136b325214
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0
deleted file mode 100644
index 7b2fff72c17c..000000000000
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=MD4 message digest algorithm
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Digest-MD4/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=36d47153b824c7b2d75ef346acbd48ad
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
index 923cef02cfb4..d828854fafd6 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=MD4 message digest algorithm
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Digest-MD4/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b59d86cdeaa26419988f10de69b8ac28
+_md5_=aa077b5edb4e5c2529bdafbd5de48887
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.160.1 b/metadata/md5-cache/dev-perl/Fuse-0.160.1
index 202cfc9d0556..afcfdab8ed36 100644
--- a/metadata/md5-cache/dev-perl/Fuse-0.160.1
+++ b/metadata/md5-cache/dev-perl/Fuse-0.160.1
@@ -3,10 +3,10 @@ DEPEND=sys-fs/fuse dev-lang/perl:=[-build(-)]
 DESCRIPTION=Fuse module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Fuse/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPATES/Fuse-0.16.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=eb00c8a8bebc92199e966d116d102b6a
+_md5_=cae5f117ec5d32394e6504c9c7916c6e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.0.1-r1 b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.0.1-r1
index e8c13b68020a..f461a162558e 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.0.1-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.0.1-r1
@@ -3,10 +3,10 @@ DEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=[-b
 DESCRIPTION=HTTP content negotiation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Negotiate/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d7c4e2992cfd2cea5bd9003fe7f9d1d7
+_md5_=534bdcff10053b1cf7e9fc878e7fba35
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-IP-0.230.0 b/metadata/md5-cache/dev-perl/IO-Socket-IP-0.230.0
index 731648f2a306..a1867c8bad03 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-IP-0.230.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-IP-0.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=A drop-in replacement for IO::Socket::INET supporting both IPv4 and
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-IP/
 IUSE=test
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-Socket-1.970.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.23.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0d392d92b8775cd71c77c902f5660174
+_md5_=21b26d0eb9b15fa73decd26487b75a58
diff --git a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1 b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
index 599d1ff5de83..277cc8eefba4 100644
--- a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Abstract base class for portable servers
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-Daemon/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/Net-Daemon-0.48.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=68f3b9a3bc7215274ddc0cad0bf34bf7
+_md5_=fbc0050631209675c06bb310b32e7f10
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
new file mode 100644
index 000000000000..640bda9e401f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=[-build(-)]
+DESCRIPTION=The Perl RPC Module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/PlRPC/
+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=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=33d5783c31e07f31fa6b13bec0425ce8
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.1 b/metadata/md5-cache/dev-perl/Return-Value-1.666.1
deleted file mode 100644
index ad56f2c03254..000000000000
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Polymorphic Return Values
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Return-Value/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666001.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=00b49c2ab2b2f38f715f00db3da26b2c
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1 b/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
index a2a747f96fa1..a42a29908d1b 100644
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
+++ b/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Polymorphic Return Values
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Return-Value/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666001.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e32c27a6d9a37363ae7797ddfb309e41
+_md5_=e858acb2e801b771704b24e7b4499190
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.300.200 b/metadata/md5-cache/dev-perl/TermReadKey-2.300.200
index 5c966aedf193..470ed10c795a 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.300.200
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.300.200
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Change terminal modes, and perform non-blocking reads
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/TermReadKey/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=TermReadKey
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STSI/TermReadKey-2.30.02.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7d9c51d87d93b3feb649dcc270211dc6
+_md5_=cf36fc81eadbec9d1f43ac63d4976f0d
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0 b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0
index a05773900cbb..50ba86be266c 100644
--- a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0
+++ b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=US-ASCII transliterations of Unicode text
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Text-Unidecode/
-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 arm64 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=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-0.04.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f09aaeecb1f5000e4d34c4495f2381df
+_md5_=c5a0b17a6b04a4b17dd7c92f0547d2ef
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.320.0 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.320.0
index 50bfef8c83d3..d1ddfb85dabd 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.320.0
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.320.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker || ( >=dev-lang/pe
 DESCRIPTION=East Asian Width properties
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Unicode-EastAsianWidth/
-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 arm64 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=CC0-1.0
 RDEPEND=virtual/perl-File-Spec || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.32.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dd70cb1dee676edcb6e550cedcad2775
+_md5_=3a4f3f38ac0615d53dddb65b0a3125e7
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0
index e277e9a85ab2..a2a61297faa4 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker || ( >=dev-lang/pe
 DESCRIPTION=East Asian Width properties
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Unicode-EastAsianWidth/
-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 ~arm64 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=CC0-1.0
 RDEPEND=virtual/perl-File-Spec || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.33.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e5f17ce9ffd19972c8a85d3c444ed549
+_md5_=8028d9c765d96d44a3360143ad081a67
diff --git a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.30.0 b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.30.0
deleted file mode 100644
index 359b0a83f36c..000000000000
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.30.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/zeromq >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 >=virtual/perl-ExtUtils-MakeMaker-6.360.0 virtual/pkgconfig test? ( dev-perl/Test-Requires dev-perl/Test-Fatal >=dev-perl/Test-TCP-1.80.0 >=virtual/perl-Test-Simple-0.980.0 ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=A libzmq 2.x wrapper for Perl
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/ZMQ-LibZMQ2/
-IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=net-libs/zeromq >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ2-1.03.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a9ffbfec2ffa842ff8ff5fb21880c56d
diff --git a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0 b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0
index de6bc22ddc3d..db3476da3abe 100644
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0
+++ b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/zeromq >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-perl/Task-Weaken >=virtual/perl-ExtUtils-MakeMaker-6.360.0 virtual/pkgconfig test? ( dev-perl/Test-Requires dev-perl/Test-Fatal >=dev-perl/Test-TCP-1.80.0 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=[-build(-)]
+DEPEND==net-libs/zeromq-2* >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-perl/Task-Weaken >=virtual/perl-ExtUtils-MakeMaker-6.360.0 virtual/pkgconfig test? ( dev-perl/Test-Requires dev-perl/Test-Fatal >=dev-perl/Test-TCP-1.80.0 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=A libzmq 2.x wrapper for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ZMQ-LibZMQ2/
 IUSE=test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=net-libs/zeromq >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=[-build(-)]
+RDEPEND==net-libs/zeromq-2* >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ2-1.04.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a3eb72b07d138c24ebf798b8d63e219e
+_md5_=e2dd20ec23f8fbac6fe3dc0628aa52fe
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 3dcd91d31481..a39563cf115b 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.200.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.200.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=High-Level Interface to Uniforum Message Translation
 EAPI=4
 HOMEPAGE=http://guido-flohr.net/projects/libintl-perl http://search.cpan.org/dist/libintl-perl/
-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 arm64 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=LGPL-2.1
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.20.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1014d8f1f01edc96bbe3f74cdcdf94f7
+_md5_=e7fb8fd08659b74f9bc59c5cb091d845
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.230.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.230.0
index 26af43e7beee..c16ca3a84f25 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.230.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.230.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=High-Level Interface to Uniforum Message Translation
 EAPI=5
 HOMEPAGE=http://guido-flohr.net/projects/libintl-perl http://search.cpan.org/dist/libintl-perl/
-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 ~arm64 ~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=LGPL-2.1
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7de3f63699c5715d3066ceaa577e0c0c
+_md5_=8a6aafcbee0c0599af12d8391ce04afb
diff --git a/metadata/md5-cache/dev-perl/math-pari-2.10.806.50 b/metadata/md5-cache/dev-perl/math-pari-2.10.806.50
index dfe1926f179e..834976d5cd2a 100644
--- a/metadata/md5-cache/dev-perl/math-pari-2.10.806.50
+++ b/metadata/md5-cache/dev-perl/math-pari-2.10.806.50
@@ -3,10 +3,10 @@ DEPEND=~sci-mathematics/pari-2.3.5 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16
 DESCRIPTION=Perl interface to PARI
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Math-Pari/
-KEYWORDS=~alpha ~amd64 hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=~sci-mathematics/pari-2.3.5 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.01080605.tar.gz http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.5.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b32ec5df9b9c9b4e7b1decf849c9509c
+_md5_=ceab3a59ceb2c5cb175b92873d39e456
diff --git a/metadata/md5-cache/dev-perl/perl-ldap-0.570.0 b/metadata/md5-cache/dev-perl/perl-ldap-0.570.0
index bbad98cdeee7..1a23660025e1 100644
--- a/metadata/md5-cache/dev-perl/perl-ldap-0.570.0
+++ b/metadata/md5-cache/dev-perl/perl-ldap-0.570.0
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of perl modules which provide an object-oriented interf
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/perl-ldap/
 IUSE=sasl xml ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Convert-ASN1 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.57.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=55da4bb816ae504ca15e79e6b7af9db4
+_md5_=01ab46c50f06ba9fadb0165cc5167add
diff --git a/metadata/md5-cache/dev-perl/yaml-0.840.0 b/metadata/md5-cache/dev-perl/yaml-0.840.0
index a526b2d72113..4ff952818d87 100644
--- a/metadata/md5-cache/dev-perl/yaml-0.840.0
+++ b/metadata/md5-cache/dev-perl/yaml-0.840.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-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-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0de91953ad4aba39f5308c2753e5b516
+_md5_=4a6c883ff3f09277883bc16e4a4d5978
diff --git a/metadata/md5-cache/dev-python/jaxml-3.02-r1 b/metadata/md5-cache/dev-python/jaxml-3.02-r1
new file mode 100644
index 000000000000..668d659910f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaxml-3.02-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=XML generator written in Python
+EAPI=5
+HOMEPAGE=http://www.librelogiciel.com/software/jaxml/action_Presentation http://pypi.python.org/pypi/jaxml
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaxml/jaxml-3.02.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c5f90d98940a7730ca4564821f1af4e1
diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.2.1 b/metadata/md5-cache/dev-python/libvirt-python-1.2.1
new file mode 100644
index 000000000000..c5392cc2f320
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-emulation/libvirt-0.9.6:=[-python(-)] virtual/pkgconfig test? ( dev-python/lxml ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=libvirt Python bindings
+EAPI=5
+HOMEPAGE=http://www.libvirt.org
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=app-emulation/libvirt-0.9.6:=[-python(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.2.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ae4895110566fe527a249406601280c8
diff --git a/metadata/md5-cache/dev-python/platinfo-0.15.0 b/metadata/md5-cache/dev-python/platinfo-0.15.0
deleted file mode 100644
index baf21c82f04d..000000000000
--- a/metadata/md5-cache/dev-python/platinfo-0.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=Determines and returns consistent names for platforms
-EAPI=4
-HOMEPAGE=http://code.google.com/p/platinfo/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://platinfo.googlecode.com/files/platinfo-0.15.0.zip
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7496ff4eaf2b79283e0cd04736e70931
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.21-r4 b/metadata/md5-cache/dev-python/pyelftools-0.21-r4
index 2808fe7c18c6..451e4f67a06a 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.21-r4
+++ b/metadata/md5-cache/dev-python/pyelftools-0.21-r4
@@ -4,11 +4,11 @@ DESCRIPTION=pure-Python library for parsing and analyzing ELF files and DWARF de
 EAPI=4
 HOMEPAGE=http://pypi.python.org/pypi/pyelftools https://bitbucket.org/eliben/pyelftools
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.21.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0f38480b1d5b4380b69ea2f11c3a33b9
+_md5_=de59a6bac2a8be232ea616b87c17f330
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
index e0f09655b3fd..786ea858c2f4 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python FTP server library
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib
 IUSE=examples ssl python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_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
+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
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0[ssl(+)] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://pyftpdlib.googlecode.com/files/pyftpdlib-1.0.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ad6fc6cc958f7f5470036a1a476b3943
+_md5_=781510496c65b2976ce3f873819711d2
diff --git a/metadata/md5-cache/dev-python/pypax-0.8.4 b/metadata/md5-cache/dev-python/pypax-0.8.4
index 13e1d60b8bd0..5c3a1a039aac 100644
--- a/metadata/md5-cache/dev-python/pypax-0.8.4
+++ b/metadata/md5-cache/dev-python/pypax-0.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~blueness/elfix/ http://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
 IUSE=+ptpax +xtpax python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/elfix/elfix-0.8.4.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3db8470623c6f9fde9b241061ce0b683
+_md5_=97f4ccc4cfa23840ebe57e7f7ab6d12e
diff --git a/metadata/md5-cache/dev-python/pyro-4.22 b/metadata/md5-cache/dev-python/pyro-4.22
index 0422f9799e70..0e6636120906 100644
--- a/metadata/md5-cache/dev-python/pyro-4.22
+++ b/metadata/md5-cache/dev-python/pyro-4.22
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced and powerful Distributed Object Technology system written e
 EAPI=5
 HOMEPAGE=http://www.xs4all.nl/~irmen/pyro/ http://pypi.python.org/pypi/Pyro4
 IUSE=doc examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!dev-python/pyro:0 dev-python/serpent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.22.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ce87248c616ec5256a9fb419b0c3a845
+_md5_=b7f1e783c5ec6cc129cf58ce8f55a4e6
diff --git a/metadata/md5-cache/dev-python/python-iwscan-20080402-r1 b/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
index 324a37c3f6b2..d166233f936a 100644
--- a/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
+++ b/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python extension for iwscan access
 EAPI=5
 HOMEPAGE=http://projects.otaku42.de/browser/python-iwscan
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-wireless/wireless-tools python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-iwscan-20080402.tar.bz2
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=196d993e19017a13416517451b2bdcac
+_md5_=8fb37a6804b263bc312557fa13de1dde
diff --git a/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1 b/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
index 62b840b50348..90c3dd7633b9 100644
--- a/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
+++ b/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python extension for wpa_supplicant/hostapd control interface acce
 EAPI=5
 HOMEPAGE=http://projects.otaku42.de/wiki/PythonWpaCtrl
 IUSE=python_targets_python2_6 python_targets_python2_7
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-wpactrl-20081102.tar.bz2
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=359c7e7ee509b478847ec4dfb0e98529
+_md5_=82d29aeee444d53664c930049601ff18
diff --git a/metadata/md5-cache/dev-python/pyzor-0.5.0-r2 b/metadata/md5-cache/dev-python/pyzor-0.5.0-r2
index 6bb6b232bfd4..c58a87ebaca7 100644
--- a/metadata/md5-cache/dev-python/pyzor-0.5.0-r2
+++ b/metadata/md5-cache/dev-python/pyzor-0.5.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A distributed, collaborative spam detection and filtering network
 EAPI=3
 HOMEPAGE=http://pyzor.sourceforge.net/
 IUSE=pyzord
-KEYWORDS=~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ia64 ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND==dev-lang/python-2* pyzord? ( =dev-lang/python-2*[gdbm] )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyzor/pyzor-0.5.0.tar.bz2
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f454ed98b0a661154cec81992bff5583
+_md5_=12662f4a3ede977fa1cbae3564a74d3e
diff --git a/metadata/md5-cache/dev-python/serpent-1.4 b/metadata/md5-cache/dev-python/serpent-1.4
index f93efd30b9b0..5707c1de2fbc 100644
--- a/metadata/md5-cache/dev-python/serpent-1.4
+++ b/metadata/md5-cache/dev-python/serpent-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=A simple serialization library based on ast.literal_eval
 EAPI=5
 HOMEPAGE=https://pypi.python.org/packages/source/s/serpent/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.4.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2f40fa3617598a95ab6ad5db37d49333
+_md5_=d6e4f0933fc940d4316bbc61b723eda7
diff --git a/metadata/md5-cache/dev-python/twisted-conch-13.2.0 b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
new file mode 100644
index 000000000000..dd09b54572f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted SSHv2 implementation
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Conch/13.2/TwistedConch-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=97092ca951c79a1c879113108f7a9b07
diff --git a/metadata/md5-cache/dev-python/twisted-core-13.2.0 b/metadata/md5-cache/dev-python/twisted-core-13.2.0
new file mode 100644
index 000000000000..74f4613a3326
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-core-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=net-zope/zope-interface-3.6.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=crypt gtk serial python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=net-zope/zope-interface-3.6.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Core/13.2/TwistedCore-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=68778ac73f54ab467e7cb810e53adc26
diff --git a/metadata/md5-cache/dev-python/twisted-lore-13.2.0 b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
new file mode 100644
index 000000000000..ef985ae3552c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] =dev-python/twisted-web-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted documentation system
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] =dev-python/twisted-web-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Lore/13.2/TwistedLore-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=c8cb48d75dfbbb4e70aacc087ac8a83f
diff --git a/metadata/md5-cache/dev-python/twisted-mail-13.2.0 b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
new file mode 100644
index 000000000000..d4bb041c6068
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] =dev-python/twisted-names-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A Twisted Mail library, server and client
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] =dev-python/twisted-names-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Mail/13.2/TwistedMail-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=41a42c5afcfa646e1755f5808ff16add
diff --git a/metadata/md5-cache/dev-python/twisted-names-13.2.0 b/metadata/md5-cache/dev-python/twisted-names-13.2.0
new file mode 100644
index 000000000000..db735a274837
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-names-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A Twisted DNS implementation
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Names/13.2/TwistedNames-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ea9a667825325bf139834247b635d0a6
diff --git a/metadata/md5-cache/dev-python/twisted-pair-13.2.0 b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
new file mode 100644
index 000000000000..392531a6a2b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted low-level networking
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Pair/13.2/TwistedPair-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=39049a4c19d08bae770184d807eadd0e
diff --git a/metadata/md5-cache/dev-python/twisted-web-13.2.0 b/metadata/md5-cache/dev-python/twisted-web-13.2.0
new file mode 100644
index 000000000000..1b9d2042d6a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-web-13.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted web server, programmable in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=soap python_targets_python2_6 python_targets_python2_7
+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
+RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Web/13.2/TwistedWeb-13.2.0.tar.bz2
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=5c3ddf3537eb79691ebca5bf068a4219
diff --git a/metadata/md5-cache/dev-qt/assistant-4.8.5 b/metadata/md5-cache/dev-qt/assistant-4.8.5
index 536928c1b40a..309b2c29fb10 100644
--- a/metadata/md5-cache/dev-qt/assistant-4.8.5
+++ b/metadata/md5-cache/dev-qt/assistant-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qthelp-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,sqlite] webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d897bd141d70f4d1bb927c61c2385b97
+_md5_=907d283a96d38f46262cbe3835eeadef
diff --git a/metadata/md5-cache/dev-qt/designer-4.8.5 b/metadata/md5-cache/dev-qt/designer-4.8.5
index 3d3f65153e36..4c0982c136a5 100644
--- a/metadata/md5-cache/dev-qt/designer-4.8.5
+++ b/metadata/md5-cache/dev-qt/designer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=declarative phonon qt3support webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] declarative? ( ~dev-qt/qtdeclarative-4.8.5[aqua=,debug=] ) phonon? ( ~dev-qt/qtphonon-4.8.5[aqua=,debug=] ) qt3support? ( ~dev-qt/qt3support-4.8.5[aqua=,debug=] ) webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6a9e045daa3efd017d0c71aebff4e2e8
+_md5_=68abcd9d0d23cc23cc341a6d50c56959
diff --git a/metadata/md5-cache/dev-qt/linguist-4.8.5 b/metadata/md5-cache/dev-qt/linguist-4.8.5
index f27058e57614..8d92f8cae12c 100644
--- a/metadata/md5-cache/dev-qt/linguist-4.8.5
+++ b/metadata/md5-cache/dev-qt/linguist-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/designer-4.8.5[aqua=,debug=] ~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b1c3026752c479a7743bdde43446ee2b
+_md5_=4636b582c75f3ab8bce35d4094897fae
diff --git a/metadata/md5-cache/dev-qt/pixeltool-4.8.5 b/metadata/md5-cache/dev-qt/pixeltool-4.8.5
index dd1df13776c5..af99a3b8a854 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-4.8.5
+++ b/metadata/md5-cache/dev-qt/pixeltool-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Qt screen magnifier
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] !<dev-qt/qthelp-4.8.5:4
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=128cdb3d56b8ea3217fcc14e123b26f9
+_md5_=ade9c8b6df5f10fc1bc6c6d5c98cd92d
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5 b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
index d80eb7afc4ca..ed9e7c8baa58 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=50332e3dd1fde801c2767b29e312ae8d
+_md5_=916ea07d2a4f7df420b7b4c3222ef840
diff --git a/metadata/md5-cache/dev-qt/qt3support-4.8.5 b/metadata/md5-cache/dev-qt/qt3support-4.8.5
index 98dcc84145af..f403884b9fe3 100644
--- a/metadata/md5-cache/dev-qt/qt3support-4.8.5
+++ b/metadata/md5-cache/dev-qt/qt3support-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Qt3Support module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=,qt3support] ~dev-qt/qtsql-4.8.5[aqua=,debug=,qt3support]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0a45462ef705a095f22fe688dbbc896d
+_md5_=ce4044d0b8cbf3d04bc8fc83408bc581
diff --git a/metadata/md5-cache/dev-qt/qtbearer-4.8.5 b/metadata/md5-cache/dev-qt/qtbearer-4.8.5
index da85e653f854..72d2370d0770 100644
--- a/metadata/md5-cache/dev-qt/qtbearer-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtbearer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The network bearer plugins for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=connman networkmanager aqua debug pch +exceptions
-KEYWORDS=amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] connman? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ) networkmanager? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=68db6132fa0a8199e5a25722143e9e84
+_md5_=f0b026b200b93072c7d06ff722c3e82f
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.5-r1 b/metadata/md5-cache/dev-qt/qtcore-4.8.5-r1
index e590fd1f67e8..89a94aef95ef 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.5-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+glib iconv icu qt3support ssl aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 PDEPEND=qt3support? ( ~dev-qt/qtgui-4.8.5[aqua=,debug=,glib=,qt3support] )
 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
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d92a6be9bb06c9df898babbbb75a5af4
+_md5_=4f091591244e043d50315dcee20a721e
diff --git a/metadata/md5-cache/dev-qt/qtdbus-4.8.5 b/metadata/md5-cache/dev-qt/qtdbus-4.8.5
index bd9b6ce16ae6..63bd2d1622b3 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtdbus-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The DBus module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] >=sys-apps/dbus-1.2
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5226b3d802234920dacb4f254c0ee303
+_md5_=b1b3bba9b11b3803836d2e259064f579
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5 b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
index 0c22f245975e..e487bc2359e2 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Declarative module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility qt3support webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=,qt3support=] ~dev-qt/qtopengl-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtsvg-4.8.5[accessibility=,aqua=,debug=] ~dev-qt/qtxmlpatterns-4.8.5[aqua=,debug=] qt3support? ( ~dev-qt/qt3support-4.8.5[accessibility=,aqua=,debug=] ) webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=efa0e18f33753d555fb1f6dbc6993201
+_md5_=02c9c9c420ffacd4f001e5cc8f0b28b6
diff --git a/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1 b/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
index 801cf61af412..73878056b92c 100644
--- a/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 PDEPEND=qt3support? ( ~dev-qt/qt3support-4.8.5[aqua=,debug=] )
 RDEPEND=app-admin/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.5[aqua=,debug=,glib=,qt3support=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) cups? ( net-print/cups ) egl? ( media-libs/mesa[egl] ) gtkstyle? ( x11-libs/cairo[-qt4] x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) !<dev-qt/qthelp-4.8.5:4
@@ -12,4 +12,4 @@ REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5ecbad77cdb01267485136912126940c
+_md5_=57d94bb4d11286fbeadd3f7caeae2706
diff --git a/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2 b/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
index 7bc949361081..51488a235d46 100644
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
+++ b/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The Help module for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=compat doc aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,sqlite] compat? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] sys-libs/zlib )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.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_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=05f22c654c4710705de9c1e3ae4051bc
+_md5_=4dbcb776947f94079ba08cd0c7402933
diff --git a/metadata/md5-cache/dev-qt/qtopengl-4.8.5 b/metadata/md5-cache/dev-qt/qtopengl-4.8.5
index 98f657da3fce..feab98f1ec87 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtopengl-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=egl qt3support aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtgui-4.8.5[aqua=,debug=,egl=,qt3support=] virtual/opengl
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5de1fd02952cee596d22daff74244730
+_md5_=7bbee0dc319021107ed93e6b164f6e91
diff --git a/metadata/md5-cache/dev-qt/qtscript-4.8.5 b/metadata/md5-cache/dev-qt/qtscript-4.8.5
index 5f958ff2e450..44c143656d07 100644
--- a/metadata/md5-cache/dev-qt/qtscript-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtscript-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The QtScript module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=iconv +jit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bcc5bb5567b4709cf57c04079e1922b6
+_md5_=19b13125ff0c89ef0c4f1b7e276a5738
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.5 b/metadata/md5-cache/dev-qt/qtsql-4.8.5
index 143de21589e7..a15a900c3136 100644
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtsql-4.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=The SQL module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=firebird freetds mysql oci8 odbc postgres qt3support +sqlite aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] firebird? ( dev-db/firebird ) freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6b1bb4fec5a252bbc7ce12f172e56a06
+_md5_=a69e861ff2d4b0fb2616fa8648166dd4
diff --git a/metadata/md5-cache/dev-qt/qtsvg-4.8.5 b/metadata/md5-cache/dev-qt/qtsvg-4.8.5
index 46c725761d21..f28ae37b3a9d 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtsvg-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The SVG module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=] sys-libs/zlib
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=783f0a32da7723fe1292c172b84b72e7
+_md5_=1dc80ef7220630fe975098da556e4d28
diff --git a/metadata/md5-cache/dev-qt/qttest-4.8.5 b/metadata/md5-cache/dev-qt/qttest-4.8.5
index d024474b90f8..652f47ed418b 100644
--- a/metadata/md5-cache/dev-qt/qttest-4.8.5
+++ b/metadata/md5-cache/dev-qt/qttest-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The QtTest module for unit testing Qt applications and libraries
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=81334e4c9d488081f3efe3ff003e7b94
+_md5_=b9aab6aab0c45705f540b054b8a1ede6
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5 b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
index 61938faf0751..b48a36ddd2e5 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The XmlPatterns module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	qt4-build	df8f37ad99366cf3f89fa8d5b49ceb75	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3d705d98636e078143163adea62c5e8f
+_md5_=83d1ae732c8d555adf9b0e819e909ff9
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2
index fdd12b28298f..748e0bea1c7b 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=A pipe to browser utility for use at the shell and within editors li
 EAPI=4
 HOMEPAGE=http://github.com/rtomayko/bcat
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=!!app-accessibility/speech-tools ruby_targets_ruby18? ( dev-ruby/rack[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/rack[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3d1dfd1adc000ecad306880873e8514b
+_md5_=90739e4b1cf006329943a54d6c3f8ee2
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.1.0 b/metadata/md5-cache/dev-ruby/bunny-1.1.0
new file mode 100644
index 000000000000..b2b30b692fc9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=5
+HOMEPAGE=http://github.com/celldee/bunny
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=0
+SRC_URI=mirror://rubygems/bunny-1.1.0.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=3f60ca2c27429455b68e8cc7723c424f
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5
index 371de0df42e2..728a0dee141b 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5
@@ -4,11 +4,11 @@ DESCRIPTION=A distributed application deployment system
 EAPI=5
 HOMEPAGE=http://capify.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby18] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby18] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby18] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby18] >=dev-ruby/highline-1.2.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby19] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby19] >=dev-ruby/highline-1.2.7[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a5a04ced4d5bc6838d43675a5dea2432
+_md5_=05d4334e07496ceb746f1634f0976984
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.3.9 b/metadata/md5-cache/dev-ruby/childprocess-0.3.9
index b0aaec63b62c..c3ba74056fb8 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.3.9
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.3.9
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and reliable solution for controlling external programs run
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.3.9.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3b364219a289ec8e9b1caa38a1772fe5
+_md5_=59ee54d6f6fc942ceed36581a46148ef
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.5-r1 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.5-r1
index 9e209cd82fca..7ed59f87ea39 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced command line parser supporting commands
 EAPI=5
 HOMEPAGE=http://cmdparse.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.5.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e477a5f82dddf59c244c7656b540f5c9
+_md5_=c349cbb79c7a0f981f8367cfd45a7ccc
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
index 6f037b6237cc..bdf0d217bbe9 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=fast_xs text escaping library ruby bindings.
 EAPI=5
 HOMEPAGE=http://fast-xs.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6e7f3962e13deb6b7aa7d0c2e2dfdefc
+_md5_=bebfe7c0575c37b37175106e8f768059
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.11.6 b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
index 8bf1a189b770..cb9f11a325e8 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.11.6
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Gherkin lexer and parser based on Ragel.
 EAPI=4
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.11.6.tar.gz -> gherkin-2.11.6-git.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=508cb448d99e7dc0635db7d19ad79276
+_md5_=f362f1beebde2fc82d688c0d628d0690
diff --git a/metadata/md5-cache/dev-ruby/hoe-2.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-2.13.0-r1
index 4ebce8ca66d4..503dd9e53eb1 100644
--- a/metadata/md5-cache/dev-ruby/hoe-2.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-2.13.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Hoe extends rake to provide full project automation.
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] >=dev-ruby/rdoc-3.10[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-ruby/rdoc-3.10[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] >=dev-ruby/rdoc-3.10[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/rake-0.8.7[ruby_targets_jruby] >=dev-ruby/rdoc-3.10[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-2.13.0.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=78a40f56dca5d7b5e6849d6f28234d47
+_md5_=83b1b9107a171dea25c6c6a244a21297
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
index ac80870e8af5..5c2a5fd0d9da 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Hoe plugins providing tasks used by seattle.rb
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/hoe-seattlerb
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.2.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7ed4a151c62a55e00f87895dadacb53f
+_md5_=be7d91b789cc9eabd1b1529a9359d8f2
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
index 481b6fb99756..76257282fabb 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Adds a __metaclass__ method to all Ruby objects.
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/metaclass
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/metaclass-0.0.1.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b6d953be737e8c15cb9c8a61a9cb5a0d
+_md5_=27cdf18a61ac36fd58cdf6326ce6e7d1
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.5-r1 b/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
index 9cf653dcb330..0d76c1392b6b 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/ruby-ssl[ruby_targets_jruby] ) !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3 ruby_targets_ruby18? ( dev-lang/ruby: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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=1.4
 SRC_URI=mirror://rubyforge/rack/rack-1.4.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=75658be25046343936142f0a6f3217c1
+_md5_=f319d7ea5f9cfad1f5d43d4f95d8c2bf
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.2-r1 b/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
index 02c468f4dcc6..418263630f40 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/ruby-ssl[ruby_targets_jruby] ) !<dev-ruby/rack-1.4.5-r1:1.4 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=1.5
 SRC_URI=mirror://rubyforge/rack/rack-1.5.2.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=60f14d34c520ae88da8289114d8c09cd
+_md5_=80dcacaebf381283afb0a7b3cd7f3709
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.0
new file mode 100644
index 000000000000..e07ca26ee744
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/timecop[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/timecop[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/timecop[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=A Text Progress Bar Library for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby: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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-progressbar-1.4.0.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=2e18fd58ec7b8e15a2a7c0a88ae45942
diff --git a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3 b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
index cf8dacda61d9..fdf477e66fd7 100644
--- a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Simplistic script which automates a limited set of rubyforge operati
 EAPI=5
 HOMEPAGE=http://codeforpeople.rubyforge.org/rubyforge/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/json-1.1.7[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyforge-2.0.4.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7bffb9b49fb76d6837e4e83e20432536
+_md5_=75da591de7e73bffb85f245ebdd5ed2a
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2 b/metadata/md5-cache/dev-ruby/spork-0.9.2
index fc55d08513ee..b91a7d7dce85 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Spork is Tim Harper's implementation of test server.
 EAPI=4
 HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cc680a9ab9c9e42e090406bc4c544756
+_md5_=1efb8830d63fe1f7fb0ef35be18d75e0
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.2.16 b/metadata/md5-cache/dev-ruby/stomp-1.2.16
index 062a5abc199f..a3cd75312386 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.2.16
+++ b/metadata/md5-cache/dev-ruby/stomp-1.2.16
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby bindings for the stomp messaging protocol
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/stomp/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby: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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.2.16.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d82cff1a359ea913568660e4138c11df
+_md5_=693ca0dbb136ee0d88cfd4230fd38e9d
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
index 622a2291f1eb..aba50d0e0c9e 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An improved version of the Test::Unit framework from Ruby 1.8
 EAPI=5
 HOMEPAGE=http://test-unit.rubyforge.org/
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=714678afb8cd85f8d0c183f8d0d8b0ed
+_md5_=ad0e09c079f00145d15acba60f3ded5e
diff --git a/metadata/md5-cache/dev-ruby/tins-0.13.1 b/metadata/md5-cache/dev-ruby/tins-0.13.1
index 28545e7665be..41c5881077d3 100644
--- a/metadata/md5-cache/dev-ruby/tins-0.13.1
+++ b/metadata/md5-cache/dev-ruby/tins-0.13.1
@@ -4,11 +4,11 @@ DESCRIPTION=All the stuff that isn't good enough for a real library.
 EAPI=5
 HOMEPAGE=http://github.com/flori/tins
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~amd64 ~hppa ~ppc ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-0.13.1.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ab5cea9f94c693fd8808e30e665033d8
+_md5_=999a21d5a5b6c5edb8bf84717a2f7709
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.3-r1 b/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
index 0f5f6bb25f10..38cac9a0ea63 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A wrapper library to bring Unicode Normalization Form support to Rub
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-unf
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/unf_ext[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/unf_ext[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/unf_ext[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.3.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=70d508f1590e23b673e2de3b91a1f007
+_md5_=d1d8faa0c6cc88fb920d1afb590b896f
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
index 0176382e3ffd..581c2b534fe9 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=5
 HOMEPAGE=http://sourceforge.jp/projects/unf/
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.6.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=616e3254e68da3c8a9a765d77252992b
+_md5_=36eab96c0bc0bed42ee945e099604c67
diff --git a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2 b/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2
deleted file mode 100644
index 78d9b3dc062d..000000000000
--- a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl sys-libs/readline
-DESCRIPTION=Readline extension to TCL
-EAPI=5
-HOMEPAGE=http://tclreadline.sf.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tcl sys-libs/readline
-SLOT=0
-SRC_URI=mirror://sourceforge/tclreadline/tclreadline-2.1.0.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=22d8f5536cb72100cb0a9d143f08ee92
diff --git a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r3 b/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r3
deleted file mode 100644
index a0766d6e290a..000000000000
--- a/metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl sys-libs/readline !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Readline extension to TCL
-EAPI=5
-HOMEPAGE=http://tclreadline.sf.net/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tcl sys-libs/readline
-SLOT=0
-SRC_URI=mirror://sourceforge/tclreadline/tclreadline-2.1.0.tar.gz
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dde6eaf434769e434bbb932193edc533
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.3 b/metadata/md5-cache/dev-util/aruba-0.5.3
index 12c412182bfc..a4013b14af75 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.3
+++ b/metadata/md5-cache/dev-util/aruba-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications.
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby18] =dev-ruby/childprocess-0.3*[ruby_targets_ruby18] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby18] >=dev-util/cucumber-1.1.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19] =dev-ruby/childprocess-0.3*[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.1[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.3.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d9053709fc5e6ba188d9b525819fdcbd
+_md5_=5ce66b9abde869e34feb8b30aaea982c
diff --git a/metadata/md5-cache/dev-util/bnfc-2.4.2.0 b/metadata/md5-cache/dev-util/bnfc-2.4.2.0
index d808d29cc2ac..ea18a762f65e 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.4.2.0
+++ b/metadata/md5-cache/dev-util/bnfc-2.4.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/BNFC/2.4.2.0/BNFC-2.4.2.0.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=25f093a7dc7f51a5e8fbbeba4630ea10
diff --git a/metadata/md5-cache/dev-util/bnfc-2.4.2.1 b/metadata/md5-cache/dev-util/bnfc-2.4.2.1
index d861884abcab..656c55fca45b 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.4.2.1
+++ b/metadata/md5-cache/dev-util/bnfc-2.4.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/BNFC/2.4.2.1/BNFC-2.4.2.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ee125806db1c27ca76e987e6803f3dd6
diff --git a/metadata/md5-cache/dev-util/bnfc-2.6.0.3 b/metadata/md5-cache/dev-util/bnfc-2.6.0.3
index 719a2fd57a27..70d5151d154c 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.6.0.3
+++ b/metadata/md5-cache/dev-util/bnfc-2.6.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.6.0.3
 SRC_URI=mirror://hackage/packages/archive/BNFC/2.6.0.3/BNFC-2.6.0.3.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4af1bc309f0d3e1d3ead76698b77600c
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.8-r2 b/metadata/md5-cache/dev-util/buildbot-0.8.8-r2
index 54f5f3dcfb6e..cec668fd1f1f 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.8-r2
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=BuildBot build automation system
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot
 IUSE=doc examples irc mail manhole test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1 || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 ) >=dev-python/twisted-core-8.0.0 dev-python/twisted-web <dev-python/sqlalchemy-migrate-0.8 irc? ( dev-python/twisted-words ) mail? ( dev-python/twisted-mail ) manhole? ( dev-python/twisted-conch ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.8.8.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f22c13aad465a6f24f32c19609c34f90
+_md5_=a00c2f48568a7dd71100c7228ce2c9a1
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.8-r1 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.8-r1
index 1b8c70461b50..a829a5fe5c01 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.8-r1
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=BuildBot Slave Daemon
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools dev-python/twisted-core !!<dev-util/buildbot-0.8.1 !<dev-util/buildbot-0.8.3 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.8.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2fcc3de566be19d2c985ddb3b7e430d4
+_md5_=60a70a1a5d9dddff2fd73185754a9a9c
diff --git a/metadata/md5-cache/dev-util/bustle-0.2.3 b/metadata/md5-cache/dev-util/bustle-0.2.3
index 46a12f3613bd..57c62baf9125 100644
--- a/metadata/md5-cache/dev-util/bustle-0.2.3
+++ b/metadata/md5-cache/dev-util/bustle-0.2.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=http://willthompson.co.uk/bustle/releases/bustle-0.2.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=02e8c45e4e144f470903c88aa4102ead
diff --git a/metadata/md5-cache/dev-util/bustle-0.4.0 b/metadata/md5-cache/dev-util/bustle-0.4.0
index 7c2aef0a0cd6..73aea46b120b 100644
--- a/metadata/md5-cache/dev-util/bustle-0.4.0
+++ b/metadata/md5-cache/dev-util/bustle-0.4.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=http://willthompson.co.uk/bustle/releases/0.4.0/bustle-0.4.0.tar.gz http://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a255c14909e54a6fcd8abf4cc1082053
diff --git a/metadata/md5-cache/dev-util/bustle-0.4.2 b/metadata/md5-cache/dev-util/bustle-0.4.2
index 55ed758d1b5e..4bca16773d01 100644
--- a/metadata/md5-cache/dev-util/bustle-0.4.2
+++ b/metadata/md5-cache/dev-util/bustle-0.4.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=http://willthompson.co.uk/bustle/releases/0.4.2/bustle-0.4.2.tar.gz http://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=79c8a6d985aee2b2106933053abd3819
diff --git a/metadata/md5-cache/dev-util/bustle-0.4.2-r1 b/metadata/md5-cache/dev-util/bustle-0.4.2-r1
index 4d03f726b0ba..05ec366c1f99 100644
--- a/metadata/md5-cache/dev-util/bustle-0.4.2-r1
+++ b/metadata/md5-cache/dev-util/bustle-0.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Draw pretty sequence diagrams of D-Bus traffic
 EAPI=5
 HOMEPAGE=http://willthompson.co.uk/bustle/
 IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libpcap sys-apps/dbus x11-libs/cairo x11-libs/pango gnome-base/libglade:2.0
 SLOT=0
 SRC_URI=http://willthompson.co.uk/bustle/releases/0.4.2/bustle-0.4.2.tar.gz http://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1e2af297d51e0ae4d6c47e528b96aead
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=6880399ffeb2bff6dd136fbb32a1e5cc
diff --git a/metadata/md5-cache/dev-util/ccache-3.1.9-r3 b/metadata/md5-cache/dev-util/ccache-3.1.9-r3
index 0494a15618b1..32cb4d8b78fb 100644
--- a/metadata/md5-cache/dev-util/ccache-3.1.9-r3
+++ b/metadata/md5-cache/dev-util/ccache-3.1.9-r3
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib app-arch/xz-utils
 DESCRIPTION=fast compiler cache
 EAPI=4
 HOMEPAGE=http://ccache.samba.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://samba.org/ftp/ccache/ccache-3.1.9.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d9688d773f074d9ea986de81bee53f9e
+_md5_=4b23e514a97471e6dc2f293417c5d3b6
diff --git a/metadata/md5-cache/dev-util/cucumber-1.2.1 b/metadata/md5-cache/dev-util/cucumber-1.2.1
index 0b3e8a7dd68c..75986f59c885 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Executable feature scenarios
 EAPI=2
 HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby18] >=dev-ruby/gherkin-2.11.0[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] >=dev-ruby/gherkin-2.11.0[ruby_targets_ruby19] >=dev-ruby/json-1.4.6[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ree18] >=dev-ruby/gherkin-2.11.0[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.2.1.gem
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a46833a3dd2f42ffa831360108afd2ba
+_md5_=616e184a8a6ef0fc148bcbd85d6154f8
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.52 b/metadata/md5-cache/dev-util/debootstrap-1.0.52
deleted file mode 100644
index a24b7abba525..000000000000
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Debian/Ubuntu bootstrap scripts
-EAPI=5
-HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.52.tar.gz mirror://gentoo/devices.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bed38416df6f1404b841fdc21cae8153
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.53 b/metadata/md5-cache/dev-util/debootstrap-1.0.53
deleted file mode 100644
index e078ee80f8b9..000000000000
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.53
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Debian/Ubuntu bootstrap scripts
-EAPI=5
-HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.53.tar.gz mirror://gentoo/devices.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e313be32120ef4a384a9cf2f554f96aa
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.22 b/metadata/md5-cache/dev-util/desktop-file-utils-0.22
index d79e22d94b82..6f56c729d673 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.22
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.22
@@ -4,10 +4,10 @@ DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=5
 HOMEPAGE=http://freedesktop.org/wiki/Software/desktop-file-utils
 IUSE=emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.22.tar.xz
 _eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0f90f8c3e473f0a30ef084be27910e39
+_md5_=ef5a65ec4ba9f04c2a6e0ac52cacd770
diff --git a/metadata/md5-cache/dev-util/dialog-1.2.20140112 b/metadata/md5-cache/dev-util/dialog-1.2.20140112
new file mode 100644
index 000000000000..26820a4589fa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dialog-1.2.20140112
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5 unicode? ( sys-libs/ncurses[unicode] ) nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DESCRIPTION=tool to display dialog boxes from a shell
+EAPI=4
+HOMEPAGE=http://invisible-island.net/dialog/dialog.html
+IUSE=examples minimal nls static-libs unicode
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2-r5 unicode? ( sys-libs/ncurses[unicode] )
+SLOT=0
+SRC_URI=ftp://invisible-island.net/dialog/dialog-1.2-20140112.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=d585d8c07129017713186cea4d1dcd61
diff --git a/metadata/md5-cache/dev-util/diffstat-1.58 b/metadata/md5-cache/dev-util/diffstat-1.58
index 078c40ac9043..86e70fe3e644 100644
--- a/metadata/md5-cache/dev-util/diffstat-1.58
+++ b/metadata/md5-cache/dev-util/diffstat-1.58
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Display a histogram of diff changes
 EAPI=5
 HOMEPAGE=http://invisible-island.net/diffstat/diffstat.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=ftp://invisible-island.net/diffstat/diffstat-1.58.tgz
-_md5_=e5cb83cd0ebb363d874df6ceb359a2ad
+_md5_=ee1e47ea0fef48374156ed7e2cdfad44
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.23 b/metadata/md5-cache/dev-util/geany-plugins-1.23
index 9b6d90f688e4..d66526e3ab28 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.23
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.23
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+commander debugger devhelp enchant gpg gtkspell lua markdown multiterm nls scope soup webkit
-KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 dev-lang/vala:0.12 dev-lang/vala:0.10 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.23.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f50ae8995607f8fe7015fe2cbce32534
+_md5_=3bf309d79ae51699069188d2ea2d0b48
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.5.2 b/metadata/md5-cache/dev-util/kdevelop-4.5.2
index 6e1722ec2989..bed0c4c00b9f 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-4.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Integrated Development Environment for Unix, supporting KDE/Qt, C/C+
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=+cmake +cxx debug okteta qthelp reviewboard linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-util/kdevplatform-1.5.2[reviewboard?] >=kde-base/ksysguard-4.4:4[aqua=] >=kde-base/libkworkspace-4.4:4[aqua=] okteta? ( >=kde-base/okteta-4.4:4[aqua=] ) qthelp? ( dev-qt/qthelp:4 ) reviewboard? ( dev-libs/qjson ) >=kde-base/kapptemplate-4.4:4[aqua=] dev-qt/qtdeclarative:4[webkit] cxx? ( >=sys-devel/gdb-7.0[python] ) >=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_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_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) 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_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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.5.2
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.5.2/src/kdevelop-4.5.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c9429dcc511e311a11088a6970f23386
+_md5_=90953f6be6ec11feff047785c0893e28
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.5.2 b/metadata/md5-cache/dev-util/kdevelop-php-1.5.2
index e49e8ae85e28..dad68e3e04b2 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=PHP plugin for KDevelop 4
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=debug doc linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-util/kdevelop doc? ( >=dev-util/kdevelop-php-docs-1.5.2:4 ) >=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_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_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) 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_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_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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.5.2
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.5.2/src/kdevelop-php-1.5.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4654adc0ec503b25ee46d7dc10e8bb0a
+_md5_=2dc09b240d11af26bbf71dca0481e63f
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.5.2 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.5.2
index 0b683959f687..d472a1cd9285 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=PHP documentation plugin for KDevelop 4
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=debug linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 >=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_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_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_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_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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.5.2
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.5.2/src/kdevelop-php-docs-1.5.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6c01542cc9ad237bed7438d4fb36c81f
+_md5_=8836611ffca729d5af689d7fd060f0ed
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-1.5.2 b/metadata/md5-cache/dev-util/kdevelop-python-1.5.2
index a7f919cc2d53..1dd9ec24e401 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-1.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python plugin for KDevelop 4
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org
 IUSE=debug linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_mai linguas_mr linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/kdevplatform-1.4.60 dev-util/kdevelop >=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_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_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_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) 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_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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.5.2
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/kdev-python/1.5.2/src/kdev-python-v1.5.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f96d20d79173769efd7dcdc84d4129e2
+_md5_=fb03a03bca8a5f0fe07d29804279e708
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.5.2 b/metadata/md5-cache/dev-util/kdevplatform-1.5.2
index 2fd1e1bf7e4c..36a3608175da 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.5.2
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=KDE development support libraries and apps
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org/
 IUSE=cvs debug reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_th linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/boost:= dev-libs/grantlee reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) !<dev-util/kdevelop-4.5.2:4 >=kde-base/konsole-4.7:4[aqua=] cvs? ( dev-vcs/cvs ) >=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_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) 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_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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.7:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.5.2/src/kdevplatform-1.5.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2f73dccf2fbd711249b238664fde5d39
+_md5_=fd793edc22baf35d12e61b687d763f06
diff --git a/metadata/md5-cache/dev-util/mono-tools-2.10 b/metadata/md5-cache/dev-util/mono-tools-2.10
index 5d3fe07c511d..3a340921b5fe 100644
--- a/metadata/md5-cache/dev-util/mono-tools-2.10
+++ b/metadata/md5-cache/dev-util/mono-tools-2.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND==virtual/monodoc-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/mono-2.10 virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==dev-lang/mono-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/mono-2.10 virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Set of useful Mono related utilities
 EAPI=4
 HOMEPAGE=http://www.mono-project.com/
 IUSE=+webkit gtkhtml
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 MIT
-RDEPEND==virtual/monodoc-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) >=dev-lang/mono-2.10
+RDEPEND==dev-lang/mono-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) >=dev-lang/mono-2.10
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono-tools/mono-tools-2.10.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	go-mono	95f4d6f11343dd05b134d8d1d2efd9e0	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=28666f8d9d7ce06a453bbf928b3a67c2
+_md5_=3cd3b1d88eeee55eddb594f5ae4dd796
diff --git a/metadata/md5-cache/dev-util/plasmate-1.0 b/metadata/md5-cache/dev-util/plasmate-1.0
index edbed55958c5..bdeefca4fc76 100644
--- a/metadata/md5-cache/dev-util/plasmate-1.0
+++ b/metadata/md5-cache/dev-util/plasmate-1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/gpgme dev-libs/libattica dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] >=kde-base/knewstuff-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DEPEND=app-crypt/gpgme dev-libs/libattica[qt4] dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] >=kde-base/knewstuff-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 DESCRIPTION=IDE for writing KDE Plasma/KWin components (themes, Plasmoids, runners, data engines)
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/sdk/plasmate
 IUSE=debug aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme dev-libs/libattica dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] >=kde-base/knewstuff-4.4:4[aqua=] dev-vcs/git >=kde-base/oxygen-icons-4.4:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
+RDEPEND=app-crypt/gpgme dev-libs/libattica[qt4] dev-libs/soprano >=kde-base/kdepimlibs-4.4:4[aqua=] >=kde-base/knewstuff-4.4:4[aqua=] dev-vcs/git >=kde-base/oxygen-icons-4.4:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/plasmate/1.0/src/plasmate-1.0.tar.gz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d1d601a1868398871db9692e352c95dd
+_md5_=57d9308ca6bf95076b64bdfbf58bc205
diff --git a/metadata/md5-cache/dev-util/xdelta-3.0.6 b/metadata/md5-cache/dev-util/xdelta-3.0.6
index 56ca499e0d0d..3d082120e95d 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.0.6
+++ b/metadata/md5-cache/dev-util/xdelta-3.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=a binary diff and differential compression tools. VCDIFF (RFC 3284)
 EAPI=5
 HOMEPAGE=http://xdelta.org/
 IUSE=examples test python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=3
 SRC_URI=http://xdelta.googlecode.com/files/xdelta3-3.0.6.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=670b913d365cd234922bbb2865ce63b5
+_md5_=362b69d90470f5040ad2d8f919edb56a
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.11.23 b/metadata/md5-cache/dev-vcs/cvs-1.11.23
index 8d2faef44298..e0fef5e09093 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.11.23
+++ b/metadata/md5-cache/dev-vcs/cvs-1.11.23
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=doc emacs
-KEYWORDS=~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~arm64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/zlib-1.1.4
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/stable/1.11.23/cvs-1.11.23.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/stable/1.11.23/cederqvist-1.11.23.html.bz2 mirror://gnu/non-gnu/cvs/source/stable/1.11.23/cederqvist-1.11.23.pdf mirror://gnu/non-gnu/cvs/source/stable/1.11.23/cederqvist-1.11.23.ps )
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b075a3810fb2a3bc2b2d8304dd26327c
+_md5_=bf9004877fb6bcf2491ff1b6f4357ba6
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
index 2b9e0910f105..ffee271b7622 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r10
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=271aa2e3baaf921dfc50fde167d5a080
+_md5_=2ad086e1a5d8674d6b5c0af04e59c558
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 873bf8e8c268..c89c05f2c742 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r6
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
 DESCRIPTION=Concurrent Versions System - source code revision control tools
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9adbdb18eed3f3aa0925e2c34adea18b
+_md5_=2ca621f454bb2f01c4baacdd97a20412
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 edef90f54d0f..ef30d4e7ba72 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=088198f03630d9bb9453b3b45fdfc217
+_md5_=ef4255d4ce3b2b165a332a3e779d321a
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 01dc86607fbf..bc2865dc35a4 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r8
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ae6b96b362542d2cb433df818b6de394
+_md5_=2417e888b0315a6b788c1f7e6e6ef50d
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 89e14ca1ac20..f064bb51593c 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r9
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8a74f27da7b061cff32a3005d9bb9200
+_md5_=856430c6a751fbe30ed2dc3de8d28ae2
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 5ffb10a70b88..f27a9fd75382 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc emacs kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d46cd708e48984beb34e939fc7f3b6fc
+_md5_=bbd347878a6be02c111f9c0fa70077e3
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.13-r2 b/metadata/md5-cache/dev-vcs/cvs-1.12.13-r2
index 839222f3cd83..bad6561dc029 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13-r2
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc emacs kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3528b6e05451ffa260951697b689ed96
+_md5_=15542332a59b9182e0aac8a0f8597188
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 1cb55dcee749..03b94830b5f9 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f82c11502fa43b3c27abde13b1b8e9d5
+_md5_=d0a9494da065670f8974beec86742553
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r1 b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r1
index 1a4be3435749..8a9e65e5dedc 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r1
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b12db1a90c25a7527c31db72246848ed
+_md5_=676cc5fd3fc4e0c2eb6eecfe6a91e6ae
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r2 b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r2
index 3588d610154b..f0684c6107f2 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r2
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Versions System - source code revision control tools
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/cvs/
 IUSE=crypt doc kerberos nls pam server
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cd10867ea74944c7086ee5639a63a428
+_md5_=831345779db4cafcc8da773f22f1e772
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.8.0 b/metadata/md5-cache/dev-vcs/darcs-2.8.0
index a909fe71ac75..b6d89a6199e7 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.8.0
+++ b/metadata/md5-cache/dev-vcs/darcs-2.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/hashed-storage-0.5.6[profile?] <dev-haskell/hashed-storage-0.6[profile?] >=dev-haskell/haskeline-0.6.3[profile?] <dev-haskell/haskeline-0.7[profile?] =dev-haskell/html-1.0*[profile?] >=dev-haskell/http-4000.0.8[profile?] <dev-haskell/http-4000.3[profile?] =dev-haskell/mmap-0.5*[profile?] >=dev-haskell/mtl-1.0[profile?] <dev-haskell/mtl-2.2[profile?] >=dev-haskell/network-2.2[profile?] <dev-haskell/network-2.4[profile?] >=dev-haskell/parsec-2.0[profile?] <dev-haskell/parsec-3.2[profile?] =dev-haskell/random-1.0*[profile?] >=dev-haskell/regex-compat-0.95.1[profile?] =dev-haskell/tar-0.3*[profile?] =dev-haskell/terminfo-0.3*[profile?] >=dev-haskell/text-0.11.0.6[profile?] <dev-haskell/text-0.12.0.0[profile?] >=dev-haskell/vector-0.7[profile?] >=dev-haskell/zlib-0.5.1.0[profile?] <dev-haskell/zlib-0.6.0.0[profile?] >=dev-lang/ghc-6.10.1 net-misc/curl virtual/mta
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/darcs/2.8.0/darcs-2.8.0.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c994b774c9aaa9e713b5af30a89b0ce2
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.8.4 b/metadata/md5-cache/dev-vcs/darcs-2.8.4
index 71d3f28c08c9..99b4bef7e7ed 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.8.4
+++ b/metadata/md5-cache/dev-vcs/darcs-2.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/hashed-storage-0.5.6:=[profile?] <dev-haskell/hashed-storage-0.6:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] =dev-haskell/html-1.0*:=[profile?] =dev-haskell/mmap-0.5*:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/tar-0.3:=[profile?] <dev-haskell/tar-0.5:=[profile?] =dev-haskell/terminfo-0.3*:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-0.12.0.0:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/zlib-0.5.1.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= net-misc/curl
 SLOT=0/2.8.4
 SRC_URI=mirror://hackage/packages/archive/darcs/2.8.4/darcs-2.8.4.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=6e83039ddbe46e1568e03893843419bc
diff --git a/metadata/md5-cache/dev-vcs/git-annex-3.20111203-r1 b/metadata/md5-cache/dev-vcs/git-annex-3.20111203-r1
index be4138139fcb..a7224c5e056d 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-3.20111203-r1
+++ b/metadata/md5-cache/dev-vcs/git-annex-3.20111203-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.7.7
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/3.20111203/git-annex-3.20111203.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f1384b3fc6059dd04002b53337391684
diff --git a/metadata/md5-cache/dev-vcs/git-annex-3.20120605 b/metadata/md5-cache/dev-vcs/git-annex-3.20120605
index 348f147a516a..717284aad56e 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-3.20120605
+++ b/metadata/md5-cache/dev-vcs/git-annex-3.20120605
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.7.7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/3.20120605/git-annex-3.20120605.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d1ce9ce03b1e1fb04c6c1aad4d9ff5c3
diff --git a/metadata/md5-cache/dev-vcs/git-annex-3.20121211-r2 b/metadata/md5-cache/dev-vcs/git-annex-3.20121211-r2
index 03b7e8527f92..885c4dc60fc4 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-3.20121211-r2
+++ b/metadata/md5-cache/dev-vcs/git-annex-3.20121211-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.7.7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/3.20121211/git-annex-3.20121211.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e3f1ffd4da6ce48a92bec4a485784c90
diff --git a/metadata/md5-cache/dev-vcs/git-annex-4.20130815-r1 b/metadata/md5-cache/dev-vcs/git-annex-4.20130815-r1
index ffd7f5ae18b7..2db9f2c5835a 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-4.20130815-r1
+++ b/metadata/md5-cache/dev-vcs/git-annex-4.20130815-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.7.7 assistant? ( sys-process/lsof )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/4.20130815/git-annex-4.20130815.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=587d4c4fe8e29881434009b8ece39c03
diff --git a/metadata/md5-cache/dev-vcs/git-annex-5.20131130 b/metadata/md5-cache/dev-vcs/git-annex-5.20131130
index 3e543b73036b..f9ea24813573 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-5.20131130
+++ b/metadata/md5-cache/dev-vcs/git-annex-5.20131130
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/5.20131130/git-annex-5.20131130.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bd93e2444d01d132db3d1ab35e349fb6
diff --git a/metadata/md5-cache/dev-vcs/git-cola-1.9.1 b/metadata/md5-cache/dev-vcs/git-cola-1.9.1
index 5abf31a20c74..378c9e01dbf5 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-1.9.1
+++ b/metadata/md5-cache/dev-vcs/git-cola-1.9.1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-vcs/git app-text/asciidoc app-text/xmlto doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/gettext test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-vcs/git app-text/asciidoc app-text/xmlto sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-apps/net-tools ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 DESCRIPTION=The highly caffeinated git GUI
 EAPI=5
 HOMEPAGE=http://git-cola.github.com/
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v1.9.1.tar.gz -> git-cola-1.9.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2d965a1e93aeead601a76f76a3fe1f47
+_md5_=2d6c76bff33449b375f840ea1a17b790
diff --git a/metadata/md5-cache/dev-vcs/git-cola-1.9.3 b/metadata/md5-cache/dev-vcs/git-cola-1.9.3
index a43bebce9bc5..a4e7961492ec 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-1.9.3
+++ b/metadata/md5-cache/dev-vcs/git-cola-1.9.3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-vcs/git app-text/asciidoc app-text/xmlto sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/jsonpickle[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/PyQt4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-vcs/git app-text/asciidoc app-text/xmlto sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-apps/net-tools ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 DESCRIPTION=The highly caffeinated git GUI
 EAPI=5
 HOMEPAGE=http://git-cola.github.com/
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v1.9.3.tar.gz -> git-cola-1.9.3.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=feea2e0f92e08c58073c8c1fa678f113
+_md5_=42d288782dd6026d7fbfb9b6abdd9d7a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.1 b/metadata/md5-cache/dev-vcs/gitolite-3.1
deleted file mode 100644
index 5bff474ca12e..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=4
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=http://milki.github.com/gitolite/gitolite-3.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=030b628d9101fa3d154f7c92fa4bcb9b
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.3 b/metadata/md5-cache/dev-vcs/gitolite-3.3
deleted file mode 100644
index 273ecda28e93..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.3.tar.gz -> gitolite-3.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b78a469e493c12343a6c23b46d787e9c
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.4 b/metadata/md5-cache/dev-vcs/gitolite-3.4
deleted file mode 100644
index 25ade7b32013..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.4.tar.gz -> gitolite-3.4.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5985780d1b34e16e4b14c9334cc74680
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.5 b/metadata/md5-cache/dev-vcs/gitolite-3.5
deleted file mode 100644
index f595b85030b5..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.5.tar.gz -> gitolite-3.5.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=076d671019d084930cf4e0728ad09e37
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.5.1 b/metadata/md5-cache/dev-vcs/gitolite-3.5.1
deleted file mode 100644
index e9f1ab83c993..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.5.1.tar.gz -> gitolite-3.5.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7b577984d68269e9b22e181f13913a61
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.5.2 b/metadata/md5-cache/dev-vcs/gitolite-3.5.2
deleted file mode 100644
index 015e7f0e8858..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.5.2.tar.gz -> gitolite-3.5.2.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=dafb8afb5c107165c83472ca390958cf
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1 b/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
index 28aad1b0019b..513382303843 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/gi
 SLOT=0
 SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.5.3.1.tar.gz -> gitolite-3.5.3.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e8c57243ac98262e274a216aa4ab255a
+_md5_=583d9d0bc0480d16e821a4678935ac1e
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
similarity index 68%
rename from metadata/md5-cache/dev-vcs/gitolite-3.2
rename to metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
index 7e1c7fa9601e..c3cd6d35a6ac 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-3.2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
+DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
 EAPI=5
-HOMEPAGE=http://github.com/sitaramc/gitolite
+HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary
 IUSE=tools vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
+RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=http://milki.github.com/gitolite/gitolite-3.2.tar.gz
+SRC_URI=mirror://gentoo/gitolite-gentoo-3.5.3.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=604d75e863f6ce7b1b998f6441b6cd82
+_md5_=b1c503035b6b3398f598f52bcdc15a42
diff --git a/metadata/md5-cache/gnome-base/gnome-3.8.0-r1 b/metadata/md5-cache/gnome-base/gnome-3.8.0-r1
index 83dcccfeccf8..ed01b969072a 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.8.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-3.8.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME 3, merge this package to install
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
 IUSE=accessibility +bluetooth +classic +cdr cups +extras flashback
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=metapackage
 PDEPEND=|| ( >=gnome-base/gvfs-1.12.1[udisks] >=gnome-base/gvfs-1.12.1[gdu] )
 RDEPEND=>=gnome-base/gnome-core-libs-3.8.0[cups?] >=gnome-base/gnome-core-apps-3.8.0[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.8.0 >=x11-wm/mutter-3.8.0 >=gnome-base/gnome-shell-3.8.0[bluetooth?] >=x11-themes/gnome-backgrounds-3.8.0 >=x11-themes/gnome-icon-theme-extras-3.6.2 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.8 >=app-accessibility/at-spi2-core-2.8 >=app-accessibility/caribou-0.4.4.2 >=app-accessibility/orca-3.6.3-r1 >=gnome-extra/mousetweaks-3.8.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.8.0 ) extras? ( >=gnome-base/gnome-extra-apps-3.8.0 ) flashback? ( >=gnome-base/gnome-fallback-3.8.0 )
 SLOT=2.0
-_md5_=7821ea6c4d275f1b06eb8430b039baa1
+_md5_=14adfdb202b354b471e93e962c00219a
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.6.2 b/metadata/md5-cache/gnome-base/gnome-light-3.6.2
deleted file mode 100644
index 6df1edefd4b5..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-light-3.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta package for GNOME-Light, merge this package to install
-EAPI=5
-HOMEPAGE=http://www.gnome.org/
-IUSE=cups +fallback +gnome-shell
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=metapackage
-PDEPEND=>=gnome-base/gvfs-1.14.2
-RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.6.2[cups?] >=gnome-base/gnome-session-3.6.2 >=gnome-base/gnome-menus-3.6.1:3 >=gnome-base/gnome-settings-daemon-3.6.2[cups?] >=gnome-base/gnome-control-center-3.6.2[cups?] >=gnome-base/nautilus-3.6.2 gnome-shell? ( >=x11-wm/mutter-3.6.2 >=gnome-base/gnome-shell-3.6.2 ) fallback? ( >=gnome-base/gnome-fallback-3.6.2 ) >=x11-themes/gnome-icon-theme-3.6.2 >=x11-themes/gnome-icon-theme-symbolic-3.6.2 >=x11-themes/gnome-themes-standard-3.6.2 >=x11-terms/gnome-terminal-3.6.1
-SLOT=2.0
-_md5_=3aedeba3f10aa7875dcdddd9d34ff5ea
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.8.0 b/metadata/md5-cache/gnome-base/gnome-light-3.8.0
index 749c6ccbb614..28a3fb5fd221 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.8.0
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.8.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME-Light, merge this package to install
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
 IUSE=cups +gnome-shell
-KEYWORDS=amd64 x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.16.0
 RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.8.0[cups?] >=gnome-base/gnome-session-3.8.0 >=gnome-base/gnome-menus-3.8.0:3 >=gnome-base/gnome-settings-daemon-3.8.0[cups?] >=gnome-base/gnome-control-center-3.8.0[cups?] >=gnome-base/nautilus-3.8.0 gnome-shell? ( >=x11-wm/mutter-3.8.0 >=gnome-base/gnome-shell-3.8.0 ) >=x11-themes/gnome-icon-theme-3.8.0 >=x11-themes/gnome-icon-theme-symbolic-3.8.0 >=x11-themes/gnome-themes-standard-3.8.0 >=x11-terms/gnome-terminal-3.8.0
 SLOT=2.0
-_md5_=d0034c9a4f02fd71a48407a5fd6dd525
+_md5_=bb059a87df071b6013958e03ee457867
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.10 b/metadata/md5-cache/gnome-extra/synapse-0.2.10
index b3bc7fdc1ac4..a17026d54fe0 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.10
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 dev-lang/vala:0.14 ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A program launcher in the style of GNOME Do
-EAPI=4
+EAPI=5
 HOMEPAGE=http://launchpad.net/synapse-project/
 IUSE=plugins +zeitgeist debug
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:
 SLOT=0
 SRC_URI=http://launchpad.net/synapse-project/0.2/0.2.10/+download/synapse-0.2.10.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	b365480bc54c4e356dc1e953da9fe356	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ad22e9e9bcbb0c6ccfe5db423ea3edcf
+_md5_=bdff74f8d11ea92ce96027f2b2da05db
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.11.5 b/metadata/md5-cache/kde-base/akonadiconsole-4.11.5
index 6cb91d22cd5f..9b6375d0ed0a 100644
--- a/metadata/md5-cache/kde-base/akonadiconsole-4.11.5
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Akonadi developer console
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/nepomuk-core-4.11.5:4[aqua=] >=kde-base/nepomuk-widgets-4.11.5:4[aqua=] app-office/akonadi-server >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a7f73643467500ac7461ac1dfed5f944
+_md5_=1eddf5be3d35e79c79685afa24e28005
diff --git a/metadata/md5-cache/kde-base/akregator-4.11.5 b/metadata/md5-cache/kde-base/akregator-4.11.5
index 5606fe4efb93..94f2888dabeb 100644
--- a/metadata/md5-cache/kde-base/akregator-4.11.5
+++ b/metadata/md5-cache/kde-base/akregator-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE news feed aggregator.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/akregator
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8421239833b59b5e2b515cd7d7faba99
+_md5_=0a45f503d386f205aa60fb255a20391b
diff --git a/metadata/md5-cache/kde-base/amor-4.11.5 b/metadata/md5-cache/kde-base/amor-4.11.5
index 7fa9eb2dd15a..32a74ec09dfa 100644
--- a/metadata/md5-cache/kde-base/amor-4.11.5
+++ b/metadata/md5-cache/kde-base/amor-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Amusing Misuse Of Resources - desktop-dwelling creature
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/amor-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c4fc51eb3f6ec05631090947e32cde6c
+_md5_=94bdd68ee992756fbc78d946fc7b0fb4
diff --git a/metadata/md5-cache/kde-base/analitza-4.11.5 b/metadata/md5-cache/kde-base/analitza-4.11.5
index 3eb0a02d0f7b..cd210f1aadb7 100644
--- a/metadata/md5-cache/kde-base/analitza-4.11.5
+++ b/metadata/md5-cache/kde-base/analitza-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE library for mathematical features
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug readline opengl aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=opengl? ( virtual/glu ) readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/analitza-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=13f32d1d98681416432c7688cab4dda5
+_md5_=589dc34c43e851a5aa5f80f0ad1232c9
diff --git a/metadata/md5-cache/kde-base/ark-4.11.5 b/metadata/md5-cache/kde-base/ark-4.11.5
index 583907c5a6bc..21a73952f3a9 100644
--- a/metadata/md5-cache/kde-base/ark-4.11.5
+++ b/metadata/md5-cache/kde-base/ark-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Archiving tool
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/ark http://utils.kde.org/projects/ark
 IUSE=+archive +bzip2 debug lzma +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] sys-libs/zlib archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ark-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1f9a79e9c52299990f145d9ffbb5e8e8
+_md5_=975db22a8cbf4b13fa8d3365ecfcf1d9
diff --git a/metadata/md5-cache/kde-base/attica-4.11.2 b/metadata/md5-cache/kde-base/attica-4.11.2
index a575a2d275bc..2fc43bc7bf19 100644
--- a/metadata/md5-cache/kde-base/attica-4.11.2
+++ b/metadata/md5-cache/kde-base/attica-4.11.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libattica-0.1.4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
+DEPEND=>=dev-libs/libattica-0.1.4[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
 DESCRIPTION=Open Collaboration Services provider management
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.11.2:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
+RDEPEND=>=dev-libs/libattica-0.1.4[qt4] >=kde-base/oxygen-icons-4.11.2:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.2/src/kde-runtime-4.11.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a708fbbad05a80a435343ca3da7e5863
+_md5_=34011662f0c40706c7b101d36e0bd163
diff --git a/metadata/md5-cache/kde-base/attica-4.11.5 b/metadata/md5-cache/kde-base/attica-4.11.5
index ec7ff2ee9283..ba39ac0d9225 100644
--- a/metadata/md5-cache/kde-base/attica-4.11.5
+++ b/metadata/md5-cache/kde-base/attica-4.11.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libattica-0.1.4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
+DEPEND=>=dev-libs/libattica-0.1.4[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 DESCRIPTION=Open Collaboration Services provider management
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
+RDEPEND=>=dev-libs/libattica-0.1.4[qt4] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ae4621a17b31afef5c50fb91111b1101
+_md5_=5af22175185a7504329d9a3782db6e04
diff --git a/metadata/md5-cache/kde-base/attica-4.12.0 b/metadata/md5-cache/kde-base/attica-4.12.0
index 5cf52b3e64de..d626cbc6231e 100644
--- a/metadata/md5-cache/kde-base/attica-4.12.0
+++ b/metadata/md5-cache/kde-base/attica-4.12.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libattica-0.1.4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
+DEPEND=>=dev-libs/libattica-0.1.4[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
 DESCRIPTION=Open Collaboration Services provider management
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.12.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
+RDEPEND=>=dev-libs/libattica-0.1.4[qt4] >=kde-base/oxygen-icons-4.12.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.0/src/kde-runtime-4.12.0.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48019d6e9105824b0f1c5d82a6fd1a15
+_md5_=6b7e7bc2999f22aa203dafeb37e84e57
diff --git a/metadata/md5-cache/kde-base/attica-4.12.1 b/metadata/md5-cache/kde-base/attica-4.12.1
index 1fae47110b81..80121d8056b3 100644
--- a/metadata/md5-cache/kde-base/attica-4.12.1
+++ b/metadata/md5-cache/kde-base/attica-4.12.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libattica-0.1.4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
+DEPEND=>=dev-libs/libattica-0.1.4[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 DESCRIPTION=Open Collaboration Services provider management
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libattica-0.1.4 >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
+RDEPEND=>=dev-libs/libattica-0.1.4[qt4] >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kde-runtime-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=76c15951446772112d11a858386bbf07
+_md5_=927cac97c1be0fd2852943da01d5694f
diff --git a/metadata/md5-cache/kde-base/audiocd-kio-4.11.5 b/metadata/md5-cache/kde-base/audiocd-kio-4.11.5
index 4d9cc3f94038..3cd6caf8189a 100644
--- a/metadata/md5-cache/kde-base/audiocd-kio-4.11.5
+++ b/metadata/md5-cache/kde-base/audiocd-kio-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE kioslaves from the kdemultimedia package
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug flac vorbis +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.11.5:4[aqua=] >=kde-base/libkcompactdisc-4.11.5:4[aqua=] media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/audiocd-kio-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c7a3bf1608825b6e99046d737028bb62
+_md5_=58115aaea528ae90f21f4aaa9192e7e6
diff --git a/metadata/md5-cache/kde-base/blinken-4.11.5 b/metadata/md5-cache/kde-base/blinken-4.11.5
index db01758d841f..8aad9f5ce67e 100644
--- a/metadata/md5-cache/kde-base/blinken-4.11.5
+++ b/metadata/md5-cache/kde-base/blinken-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE version of the Simon Says game.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/blinken http://edu.kde.org/blinken
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/blinken-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6736bfd5b8acfdd5ae7de8c5fdf93a47
+_md5_=b201277395b69fe106c1c52d1772e95f
diff --git a/metadata/md5-cache/kde-base/blogilo-4.11.5 b/metadata/md5-cache/kde-base/blogilo-4.11.5
index f851ea08a3c8..84761c10056b 100644
--- a/metadata/md5-cache/kde-base/blogilo-4.11.5
+++ b/metadata/md5-cache/kde-base/blogilo-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Blogging Client
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/blogilo
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a981025b785060dd02f7b6d90bab71fa
+_md5_=1778873d79b17f28ffc0649eea78efb4
diff --git a/metadata/md5-cache/kde-base/bomber-4.11.5 b/metadata/md5-cache/kde-base/bomber-4.11.5
index 68ae43312bbb..9ac041556ba5 100644
--- a/metadata/md5-cache/kde-base/bomber-4.11.5
+++ b/metadata/md5-cache/kde-base/bomber-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE arcade bombing game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/bomber/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/bomber-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ef9dd63f395310ada077fd867b42b779
+_md5_=5ca74c2f6a1388d510cc22790d60a08d
diff --git a/metadata/md5-cache/kde-base/bovo-4.11.5 b/metadata/md5-cache/kde-base/bovo-4.11.5
index 6ebe1469e417..ffdae24727b5 100644
--- a/metadata/md5-cache/kde-base/bovo-4.11.5
+++ b/metadata/md5-cache/kde-base/bovo-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Five-in-a-row Board Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/bovo/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/bovo-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ca9af1abf6dfdd407814595c19dffe4c
+_md5_=27f98c5aeaf1a75d271ad396f38bb8d0
diff --git a/metadata/md5-cache/kde-base/calendarjanitor-4.12.1 b/metadata/md5-cache/kde-base/calendarjanitor-4.12.1
index 28ead5272f51..d0df35742202 100644
--- a/metadata/md5-cache/kde-base/calendarjanitor-4.12.1
+++ b/metadata/md5-cache/kde-base/calendarjanitor-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to scan calendar data for buggy instances
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-common-libs-4.12.1:4[aqua=] >=kde-base/oxygen-icons-4.12.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.12.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kdepim-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bd5d925125ec2e2b904a0c04bc4cd4ea
+_md5_=09548f621f1c879beea541e47c70f313
diff --git a/metadata/md5-cache/kde-base/cantor-4.11.5 b/metadata/md5-cache/kde-base/cantor-4.11.5
index 25460d333f75..6e3d09915b3c 100644
--- a/metadata/md5-cache/kde-base/cantor-4.11.5
+++ b/metadata/md5-cache/kde-base/cantor-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE4 interface for doing mathematics and scientific computing
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/cantor http://edu.kde.org/cantor
 IUSE=analitza debug postscript qalculate +R +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=analitza? ( >=kde-base/analitza-4.11.5:4[aqua=] ) qalculate? ( sci-libs/cln sci-libs/libqalculate ) postscript? ( app-text/libspectre ) R? ( dev-lang/R ) dev-qt/qtxmlpatterns:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/cantor-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=acab9d37435d1237e44d7a22ea65360a
+_md5_=737fc309f57783f5cb739000954f2c0f
diff --git a/metadata/md5-cache/kde-base/cervisia-4.11.5 b/metadata/md5-cache/kde-base/cervisia-4.11.5
index 061e2fdcff68..b7ad504a909c 100644
--- a/metadata/md5-cache/kde-base/cervisia-4.11.5
+++ b/metadata/md5-cache/kde-base/cervisia-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Cervisia - A KDE CVS frontend
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/cervisia
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-vcs/cvs >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/cervisia-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=022e5ca32f26da8bb7f00da4001c433f
+_md5_=4572c822b3d2d4e9671a68b26b8601db
diff --git a/metadata/md5-cache/kde-base/contactthemeeditor-4.12.1 b/metadata/md5-cache/kde-base/contactthemeeditor-4.12.1
index 4afca9852c32..5e8dc773fe7e 100644
--- a/metadata/md5-cache/kde-base/contactthemeeditor-4.12.1
+++ b/metadata/md5-cache/kde-base/contactthemeeditor-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=A contact theme editor for KAddressBook
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kaddressbook-4.12.1:4[aqua=] >=kde-base/oxygen-icons-4.12.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.12.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kdepim-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3a081b802acc5d86fcb417eff3677750
+_md5_=2ab971c4ac864b74934008278b2667b6
diff --git a/metadata/md5-cache/kde-base/dolphin-4.11.5 b/metadata/md5-cache/kde-base/dolphin-4.11.5
index 384ee7faa89a..4d7bc9205a0a 100644
--- a/metadata/md5-cache/kde-base/dolphin-4.11.5
+++ b/metadata/md5-cache/kde-base/dolphin-4.11.5
@@ -4,7 +4,7 @@ DESCRIPTION=A KDE filemanager focusing on usability
 EAPI=5
 HOMEPAGE=http://dolphin.kde.org http://www.kde.org/applications/system/dolphin
 IUSE=debug semantic-desktop thumbnail +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=thumbnail? ( >=kde-base/thumbnailers-4.11.5:4[aqua=] || ( >=kde-base/ffmpegthumbs-4.11.5:4[aqua=] >=kde-base/mplayerthumbs-4.11.5:4[aqua=] ) )
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/libkonq-4.11.5:4[aqua=] x11-libs/libXrender semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 dev-libs/soprano >=kde-base/nepomuk-core-4.11.5:4[aqua=] >=kde-base/nepomuk-widgets-4.11.5:4[aqua=] ) >=kde-base/kfind-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4bcbd2791b5c37bf4174ce99db685f5e
+_md5_=8b75f047c5f976c9bb2807034bd9887e
diff --git a/metadata/md5-cache/kde-base/dolphin-plugins-4.11.5 b/metadata/md5-cache/kde-base/dolphin-plugins-4.11.5
index 221b1b100a99..4cc4feb10bea 100644
--- a/metadata/md5-cache/kde-base/dolphin-plugins-4.11.5
+++ b/metadata/md5-cache/kde-base/dolphin-plugins-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Extra Dolphin plugins
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug bazaar git mercurial subversion aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/kompare-4.11.5:4[aqua=] bazaar? ( dev-vcs/bzr ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/dolphin-plugins-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d1a606c8d226a0ad3af78435e3a42c3f
+_md5_=017f2e83e137926254b633fa1b8147fd
diff --git a/metadata/md5-cache/kde-base/dolphin-plugins-4.12.1 b/metadata/md5-cache/kde-base/dolphin-plugins-4.12.1
index b7cbcfe88c5a..bf97d2205a72 100644
--- a/metadata/md5-cache/kde-base/dolphin-plugins-4.12.1
+++ b/metadata/md5-cache/kde-base/dolphin-plugins-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=Extra Dolphin plugins
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug bazaar git mercurial subversion aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.12.1:4[aqua=] >=kde-base/kompare-4.12.1:4[aqua=] bazaar? ( dev-vcs/bzr ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/dolphin-plugins-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4e15de6d7c9621d659e795dc73100e71
+_md5_=42eaedcca5dc2ad9ee345e5fff9dc66b
diff --git a/metadata/md5-cache/kde-base/dragon-4.11.5 b/metadata/md5-cache/kde-base/dragon-4.11.5
index 365af98ab1a7..22f3c661db45 100644
--- a/metadata/md5-cache/kde-base/dragon-4.11.5
+++ b/metadata/md5-cache/kde-base/dragon-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Dragon Player is a simple video player for KDE 4
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/multimedia/dragonplayer
 IUSE=debug xine +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/phonon-4.4.3 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/dragon-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cdb211e8cebc3b62516cd7322d49fb02
+_md5_=5e4d14dd9494902f2e625941957c5b5f
diff --git a/metadata/md5-cache/kde-base/drkonqi-4.11.5 b/metadata/md5-cache/kde-base/drkonqi-4.11.5
index 96d6a62566b1..9f2ee4e302a9 100644
--- a/metadata/md5-cache/kde-base/drkonqi-4.11.5
+++ b/metadata/md5-cache/kde-base/drkonqi-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE crash handler, gives the user feedback if a program crashed
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48e2a374bca1925d02ac54dd73152dac
+_md5_=47e4be54f96857f7807f9bd7bb2f6ace
diff --git a/metadata/md5-cache/kde-base/ffmpegthumbs-4.11.5 b/metadata/md5-cache/kde-base/ffmpegthumbs-4.11.5
index 6ba8e18ce236..d27578bcc460 100644
--- a/metadata/md5-cache/kde-base/ffmpegthumbs-4.11.5
+++ b/metadata/md5-cache/kde-base/ffmpegthumbs-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A FFmpeg based thumbnail Generator for Video Files.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/ffmpeg >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ffmpegthumbs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=17976e80a71a41f61f5d7f080039b853
+_md5_=437c7ff6cf5244cba23a4ba1ca1662dd
diff --git a/metadata/md5-cache/kde-base/filelight-4.11.5 b/metadata/md5-cache/kde-base/filelight-4.11.5
index 836126dca5cd..127e3c968e11 100644
--- a/metadata/md5-cache/kde-base/filelight-4.11.5
+++ b/metadata/md5-cache/kde-base/filelight-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Filelight creates an interactive map of concentric, segmented rings
 EAPI=5
 HOMEPAGE=http://utils.kde.org/projects/filelight
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=x11-apps/xdpyinfo >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/filelight-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=21a411863ce20016eea862041447e34b
+_md5_=8b8fbaae556dd6393a11b2a369fc886f
diff --git a/metadata/md5-cache/kde-base/freespacenotifier-4.11.5 b/metadata/md5-cache/kde-base/freespacenotifier-4.11.5
index d93b5c310f2f..038f75a79c2a 100644
--- a/metadata/md5-cache/kde-base/freespacenotifier-4.11.5
+++ b/metadata/md5-cache/kde-base/freespacenotifier-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A module that monitors free disk space on the home dir
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=daded9b6c90cea44c574cbd5bab45e38
+_md5_=483866b867e3139a2fd921688853428d
diff --git a/metadata/md5-cache/kde-base/granatier-4.11.5 b/metadata/md5-cache/kde-base/granatier-4.11.5
index 5975ca91975e..cefda9948c9f 100644
--- a/metadata/md5-cache/kde-base/granatier-4.11.5
+++ b/metadata/md5-cache/kde-base/granatier-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Bomberman game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/granatier/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/granatier-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2643b7da65d56de3085818453b4b4069
+_md5_=b865732036628494b27b8bc3fb478674
diff --git a/metadata/md5-cache/kde-base/gwenview-4.11.5 b/metadata/md5-cache/kde-base/gwenview-4.11.5
index 6a2bca3f8adb..e43ca35524fd 100644
--- a/metadata/md5-cache/kde-base/gwenview-4.11.5
+++ b/metadata/md5-cache/kde-base/gwenview-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE image viewer
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/gwenview/ http://gwenview.sourceforge.net/
 IUSE=debug kipi semantic-desktop +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/kactivities-4.11.5:4[aqua=] media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 kipi? ( >=kde-base/libkipi-4.11.5:4[aqua=] ) semantic-desktop? ( >=kde-base/nepomuk-core-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/gwenview-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=08f21b0bba0f8d750d2e55ec38e37136
+_md5_=3cc5d94180b1a12ffe32625017c75b4e
diff --git a/metadata/md5-cache/kde-base/jovie-4.11.5 b/metadata/md5-cache/kde-base/jovie-4.11.5
index 294171016f95..0f4a8f9b3351 100644
--- a/metadata/md5-cache/kde-base/jovie-4.11.5
+++ b/metadata/md5-cache/kde-base/jovie-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Jovie is a text to speech application
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/jovie/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/jovie-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ec11fd53ab765ab26129a7b675555ba5
+_md5_=eb6250c501ff4b99c59073c15a42b995
diff --git a/metadata/md5-cache/kde-base/juk-4.11.5 b/metadata/md5-cache/kde-base/juk-4.11.5
index a1ab4a63b2f1..3a61fa5f4355 100644
--- a/metadata/md5-cache/kde-base/juk-4.11.5
+++ b/metadata/md5-cache/kde-base/juk-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Jukebox and music manager for KDE.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/multimedia/juk/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/juk-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eae9ac2b5b461d7c3d08c1129376b303
+_md5_=e5cefcc430844a700e4ad586ce051e0f
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.11.5 b/metadata/md5-cache/kde-base/kabcclient-4.11.5
index ff91de8ee1a1..2241a2fcc780 100644
--- a/metadata/md5-cache/kde-base/kabcclient-4.11.5
+++ b/metadata/md5-cache/kde-base/kabcclient-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A command line client for accessing the KDE addressbook
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2b57d4e33e836314366ac95b42bd653d
+_md5_=a1d3dca3718aa7517cf2e84818907f49
diff --git a/metadata/md5-cache/kde-base/kaccessible-4.11.5 b/metadata/md5-cache/kde-base/kaccessible-4.11.5
index 57fc396fc0af..baeb684ff890 100644
--- a/metadata/md5-cache/kde-base/kaccessible-4.11.5
+++ b/metadata/md5-cache/kde-base/kaccessible-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Provides accessibility services like focus tracking
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +speechd aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kaccessible-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=88e8241f86f50d394e7dd22e3f8547b9
+_md5_=92b6c98f53cb2fcd2ad592626dcf1158
diff --git a/metadata/md5-cache/kde-base/kactivities-4.11.5 b/metadata/md5-cache/kde-base/kactivities-4.11.5
index 90f174a24f03..5d2f5663fb11 100644
--- a/metadata/md5-cache/kde-base/kactivities-4.11.5
+++ b/metadata/md5-cache/kde-base/kactivities-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Activity Manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] !<=kde-base/kdelibs-4.7.1-r1:4 !kde-base/activitymanager:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kactivities-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9a254018f1705c44ce2b980aa98442f0
+_md5_=bb1836ee0070ee54881b3dd5b5ae610c
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.11.5 b/metadata/md5-cache/kde-base/kaddressbook-4.11.5
index c9e10a9c2a75..5fcf993c0e19 100644
--- a/metadata/md5-cache/kde-base/kaddressbook-4.11.5
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Address Book
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/kaddressbook/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.2.0 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=28d702a8fa53e2a35a34756a98c9e56b
+_md5_=b15564258b55b7849b4547ea7ceccb85
diff --git a/metadata/md5-cache/kde-base/kajongg-4.11.5 b/metadata/md5-cache/kde-base/kajongg-4.11.5
index 65232d438d23..a092d7aa2875 100644
--- a/metadata/md5-cache/kde-base/kajongg-4.11.5
+++ b/metadata/md5-cache/kde-base/kajongg-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=The classical Mah Jongg for four players
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kajongg/
 IUSE=debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-db/sqlite:3 >=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/pykde4-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/libkmahjongg-4.11.5:4[aqua=] >=dev-python/twisted-core-8.2.0 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kajongg-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dff150b28dcc6e052ac17352fb473375
+_md5_=f5cd642e2b061de07f5fd312bfd9e480
diff --git a/metadata/md5-cache/kde-base/kalarm-4.11.5 b/metadata/md5-cache/kde-base/kalarm-4.11.5
index b12184f37a28..c0cdcb8c7772 100644
--- a/metadata/md5-cache/kde-base/kalarm-4.11.5
+++ b/metadata/md5-cache/kde-base/kalarm-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Personal alarm message, command and email scheduler for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KAlarm
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] media-libs/phonon x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4f784296ed42a19993c85b5454b5fb44
+_md5_=01f33d075a362ce7eff9fdad6fcb0bde
diff --git a/metadata/md5-cache/kde-base/kalgebra-4.11.5 b/metadata/md5-cache/kde-base/kalgebra-4.11.5
index 02383620c06e..831e65619f38 100644
--- a/metadata/md5-cache/kde-base/kalgebra-4.11.5
+++ b/metadata/md5-cache/kde-base/kalgebra-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=MathML-based graph calculator for KDE.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kalgebra http://edu.kde.org/kalgebra
 IUSE=debug opengl +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/analitza-4.11.5:4[aqua=,opengl?] >=kde-base/libkdeedu-4.11.5:4[aqua=] opengl? ( virtual/glu ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kalgebra-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d6a38f1bf342a603edb0c9bda6af9529
+_md5_=137e6b24268765863937bad5a2dfa743
diff --git a/metadata/md5-cache/kde-base/kalzium-4.11.5 b/metadata/md5-cache/kde-base/kalzium-4.11.5
index dee169eb0cb4..68f8d5aa8b44 100644
--- a/metadata/md5-cache/kde-base/kalzium-4.11.5
+++ b/metadata/md5-cache/kde-base/kalzium-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: periodic table of the elements.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kalzium http://edu.kde.org/kalzium
 IUSE=editor debug +plasma solver test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] editor? ( >=dev-cpp/eigen-2.0.3:2 sci-chemistry/avogadro >=sci-chemistry/openbabel-2.2 ) solver? ( dev-ml/facile[ocamlopt] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kalzium-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=195991663f96cd877d53b6a7a29efdb6
+_md5_=bddd488fae63e0082d0e6723747ddb89
diff --git a/metadata/md5-cache/kde-base/kamera-4.11.5 b/metadata/md5-cache/kde-base/kamera-4.11.5
index 7c9b5250f807..6b8248352f26 100644
--- a/metadata/md5-cache/kde-base/kamera-4.11.5
+++ b/metadata/md5-cache/kde-base/kamera-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE digital camera manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libgphoto2:= >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kamera-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fca5be2a5c5f10b20c8e8fa73de41add
+_md5_=e0bca13110e1896bbe70f7a0dc86828b
diff --git a/metadata/md5-cache/kde-base/kanagram-4.11.5 b/metadata/md5-cache/kde-base/kanagram-4.11.5
index c861ab3efeee..093738a71dac 100644
--- a/metadata/md5-cache/kde-base/kanagram-4.11.5
+++ b/metadata/md5-cache/kde-base/kanagram-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: letter order game.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kanagram http://edu.kde.org/kanagram
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kanagram-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=046e6d2585696012c73fc94b859c769c
+_md5_=31328b0357d605fe209cdfafe0b699d1
diff --git a/metadata/md5-cache/kde-base/kapman-4.11.5 b/metadata/md5-cache/kde-base/kapman-4.11.5
index b555aca6f206..34e637a937c5 100644
--- a/metadata/md5-cache/kde-base/kapman-4.11.5
+++ b/metadata/md5-cache/kde-base/kapman-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Pac-Man clone for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kapman/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kapman-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=229d43a4a3e7852253953ebdefa7da1a
+_md5_=ec46284f7fc04112a8428ac90f492919
diff --git a/metadata/md5-cache/kde-base/kapptemplate-4.11.5 b/metadata/md5-cache/kde-base/kapptemplate-4.11.5
index ac6a8dba47cf..f0d46c938c8c 100644
--- a/metadata/md5-cache/kde-base/kapptemplate-4.11.5
+++ b/metadata/md5-cache/kde-base/kapptemplate-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KAppTemplate - A shell script to create the necessary framework to d
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kapptemplate
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kapptemplate-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e5d9e3e6aba26657c222ceefdc7624b5
+_md5_=a3e00823ee69ed9a33d5bda3eac82a0e
diff --git a/metadata/md5-cache/kde-base/kate-4.11.5 b/metadata/md5-cache/kde-base/kate-4.11.5
index 6e11f128484f..b8b4cd0d9bf5 100644
--- a/metadata/md5-cache/kde-base/kate-4.11.5
+++ b/metadata/md5-cache/kde-base/kate-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Kate is an MDI texteditor.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kate http://kate-editor.org
 IUSE=debug python python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3 +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] >=kde-base/pykde4-4.9.2-r1:4[aqua=,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) >=kde-base/katepart-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_2? ( python_targets_python3_2 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3 ) )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kate-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=58cd888b84e8c72d6c69d6bc9942267d
+_md5_=4bc3a02840fe97167e69b565e8284b1f
diff --git a/metadata/md5-cache/kde-base/katepart-4.11.5 b/metadata/md5-cache/kde-base/katepart-4.11.5
index aeecf308efa2..cc3a89ab5ddb 100644
--- a/metadata/md5-cache/kde-base/katepart-4.11.5
+++ b/metadata/md5-cache/kde-base/katepart-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Editor KPart
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://kate-editor.org/about-katepart/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kate-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2be157199fbe14ea63ad9b368e6fd51c
+_md5_=25294fca5df59c2ec5ff331640447c0a
diff --git a/metadata/md5-cache/kde-base/katomic-4.11.5 b/metadata/md5-cache/kde-base/katomic-4.11.5
index 97bd29e8da11..c49aa188e45a 100644
--- a/metadata/md5-cache/kde-base/katomic-4.11.5
+++ b/metadata/md5-cache/kde-base/katomic-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Atomic Entertainment Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/katomic/ http://games.kde.org/game.php?game=katomic
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/katomic-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ecf687217a4c9e44fa02fffd78a7f175
+_md5_=243540e76dff11e6af45604c98eba98a
diff --git a/metadata/md5-cache/kde-base/kblackbox-4.11.5 b/metadata/md5-cache/kde-base/kblackbox-4.11.5
index e3771bc7e658..fb1e94a0b97d 100644
--- a/metadata/md5-cache/kde-base/kblackbox-4.11.5
+++ b/metadata/md5-cache/kde-base/kblackbox-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Blackbox Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kblackbox-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=edb9fe60dbc0563b4b291b7d88099f2b
+_md5_=6147cb8ef0cfcb825b5e0b14b3a7fdb5
diff --git a/metadata/md5-cache/kde-base/kblocks-4.11.5 b/metadata/md5-cache/kde-base/kblocks-4.11.5
index bd6fad800dfc..ce261296c533 100644
--- a/metadata/md5-cache/kde-base/kblocks-4.11.5
+++ b/metadata/md5-cache/kde-base/kblocks-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Kblocks is a single-player Tetris-like game.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kblocks/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kblocks-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=df8c822992d4cd946f1923a82026a431
+_md5_=79d5494bba18d63e086495cdc5d4ff1d
diff --git a/metadata/md5-cache/kde-base/kbounce-4.11.5 b/metadata/md5-cache/kde-base/kbounce-4.11.5
index ed72792a6b4b..1ad31f79fc28 100644
--- a/metadata/md5-cache/kde-base/kbounce-4.11.5
+++ b/metadata/md5-cache/kde-base/kbounce-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Bounce Ball Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kbounce/ http://games.kde.org/game.php?game=kbounce
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kbounce-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e749c39d39dc793b159f615e90cd3bb7
+_md5_=98afdb3749efd316766c6590df80f2c3
diff --git a/metadata/md5-cache/kde-base/kbreakout-4.11.5 b/metadata/md5-cache/kde-base/kbreakout-4.11.5
index 3cca34a39862..bac5ce9fd83f 100644
--- a/metadata/md5-cache/kde-base/kbreakout-4.11.5
+++ b/metadata/md5-cache/kde-base/kbreakout-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A Breakout-like game for KDE.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kbreakout/ http://games.kde.org/game.php?game=kbreakout
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kbreakout-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2d3ce5631951bbd0dbfc377ef9c98e8d
+_md5_=34cf24390c4c6eddde7242dea9636ca4
diff --git a/metadata/md5-cache/kde-base/kbruch-4.11.5 b/metadata/md5-cache/kde-base/kbruch-4.11.5
index a46e73018345..3222369c6085 100644
--- a/metadata/md5-cache/kde-base/kbruch-4.11.5
+++ b/metadata/md5-cache/kde-base/kbruch-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Educational: Learn calculating with fractions
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kbruch http://edu.kde.org/kbruch
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kbruch-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0981986a123c9f44ac7c4aa7d7baa686
+_md5_=29036b87e374d3737d7d63c4d20fcba7
diff --git a/metadata/md5-cache/kde-base/kcachegrind-4.11.5 b/metadata/md5-cache/kde-base/kcachegrind-4.11.5
index 71fa3679cd73..3862e736d140 100644
--- a/metadata/md5-cache/kde-base/kcachegrind-4.11.5
+++ b/metadata/md5-cache/kde-base/kcachegrind-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Frontend for Cachegrind
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kcachegrind http://kcachegrind.sourceforge.net
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kcachegrind-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=83dd8a0970994e49b3b736d807073ca3
+_md5_=2cb61f4759216a2480ade1abb5208278
diff --git a/metadata/md5-cache/kde-base/kcalc-4.11.5 b/metadata/md5-cache/kde-base/kcalc-4.11.5
index b4b1dd536e1a..61b98c3b34b1 100644
--- a/metadata/md5-cache/kde-base/kcalc-4.11.5
+++ b/metadata/md5-cache/kde-base/kcalc-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE calculator
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kcalc http://utils.kde.org/projects/kcalc
 IUSE=debug test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kcalc-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6962595e56cf57a2dcf88c54861f62ef
+_md5_=749acda96817e86e02c5d713887259e6
diff --git a/metadata/md5-cache/kde-base/kcharselect-4.11.5 b/metadata/md5-cache/kde-base/kcharselect-4.11.5
index 85d16e65d88f..a5c0c92c89ee 100644
--- a/metadata/md5-cache/kde-base/kcharselect-4.11.5
+++ b/metadata/md5-cache/kde-base/kcharselect-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE character selection utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kcharselect http://utils.kde.org/projects/kcharselect
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kcharselect-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=99c2496490867c6f528f8bfbc542fa74
+_md5_=d6c9a32c742ee5f9788cfd7e30b05f95
diff --git a/metadata/md5-cache/kde-base/kcheckpass-4.11.5 b/metadata/md5-cache/kde-base/kcheckpass-4.11.5
index d5a2656a38a2..9b4316da17c7 100644
--- a/metadata/md5-cache/kde-base/kcheckpass-4.11.5
+++ b/metadata/md5-cache/kde-base/kcheckpass-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A simple password checker, used by any software in need of user auth
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug pam aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=pam? ( >=kde-base/kdebase-pam-7 virtual/pam ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=49568875df1ade6fb4b7239e8385097a
+_md5_=89a91003b3a4e3b9f785e231cfcc655d
diff --git a/metadata/md5-cache/kde-base/kcminit-4.11.5 b/metadata/md5-cache/kde-base/kcminit-4.11.5
index 50850c994085..784dc6be08d4 100644
--- a/metadata/md5-cache/kde-base/kcminit-4.11.5
+++ b/metadata/md5-cache/kde-base/kcminit-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KCMInit - runs startups initialization for Control Modules.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7d46ecbdcd84b74410440e3f0ac36ed6
+_md5_=ffb622640b172901dc866e610cbb523c
diff --git a/metadata/md5-cache/kde-base/kcmshell-4.11.5 b/metadata/md5-cache/kde-base/kcmshell-4.11.5
index 43d2e1a94341..18edca5efa39 100644
--- a/metadata/md5-cache/kde-base/kcmshell-4.11.5
+++ b/metadata/md5-cache/kde-base/kcmshell-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KCMShell is a utility to host KDE control modules independently of S
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9f02a72e5bca08c7e4243bdfdd63f8f7
+_md5_=26c29b39b6911482477e92e6face5308
diff --git a/metadata/md5-cache/kde-base/kcolorchooser-4.11.5 b/metadata/md5-cache/kde-base/kcolorchooser-4.11.5
index d7de057043b5..972fd6f0efa1 100644
--- a/metadata/md5-cache/kde-base/kcolorchooser-4.11.5
+++ b/metadata/md5-cache/kde-base/kcolorchooser-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE color selector/editor
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/kcolorchooser/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kcolorchooser-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4e5cd3fa849911de14a4a35176f2d340
+_md5_=8077f663fc5b0d9fc41b598c9fd002b0
diff --git a/metadata/md5-cache/kde-base/kcontrol-4.11.5 b/metadata/md5-cache/kde-base/kcontrol-4.11.5
index 64bc7784fd66..08b8d1bf2065 100644
--- a/metadata/md5-cache/kde-base/kcontrol-4.11.5
+++ b/metadata/md5-cache/kde-base/kcontrol-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Control Center
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdnssd-4.11.5:4[aqua=] >=kde-base/khotkeys-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e3c33363a76da427da71948c4653cacc
+_md5_=dd5bb4bfb358f85cffc780c510e921a1
diff --git a/metadata/md5-cache/kde-base/kcron-4.11.5 b/metadata/md5-cache/kde-base/kcron-4.11.5
index 450b78bb8624..6902bc13de76 100644
--- a/metadata/md5-cache/kde-base/kcron-4.11.5
+++ b/metadata/md5-cache/kde-base/kcron-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Task Scheduler
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!prefix? ( virtual/cron ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kcron-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d0b7ee41ce4e88acf7cbbbb079762c71
+_md5_=b9fd992336f8a5b13a7feb1db7c6b02f
diff --git a/metadata/md5-cache/kde-base/kde-base-artwork-4.11.5 b/metadata/md5-cache/kde-base/kde-base-artwork-4.11.5
index 7625398d03ff..7189b13bf7f5 100644
--- a/metadata/md5-cache/kde-base/kde-base-artwork-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-base-artwork-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE base artwork
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-base-artwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c47b79b431208f16c8556969edebafaa
+_md5_=c09a6bf982784fd8e4a6d79fcfb67a91
diff --git a/metadata/md5-cache/kde-base/kde-dev-scripts-4.11.5 b/metadata/md5-cache/kde-base/kde-dev-scripts-4.11.5
index 7d10dbade367..3babb79e1431 100644
--- a/metadata/md5-cache/kde-base/kde-dev-scripts-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-dev-scripts-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Development Scripts
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!kde-base/kdesdk-scripts:4 app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-dev-scripts-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bbd3104efb1f8dbabb165026812d8485
+_md5_=aba0b6e7e26f1d5c801712937d53eea0
diff --git a/metadata/md5-cache/kde-base/kde-dev-utils-4.11.5 b/metadata/md5-cache/kde-base/kde-dev-utils-4.11.5
index 03eef3b6de75..7240bb2af98f 100644
--- a/metadata/md5-cache/kde-base/kde-dev-utils-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-dev-utils-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Development Utilities
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!kde-base/kdesdk-misc:4 !kde-base/kstartperf:4 !kde-base/kuiviewer:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-dev-utils-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0bee589e8f2ab39d3397c3bb5ea8cc7f
+_md5_=0922173f1dde0137146d08d4341a70b3
diff --git a/metadata/md5-cache/kde-base/kde-env-4.11.5 b/metadata/md5-cache/kde-base/kde-env-4.11.5
index 1fea763ef170..d35a338bca78 100644
--- a/metadata/md5-cache/kde-base/kde-env-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-env-4.11.5
@@ -4,8 +4,8 @@ DESCRIPTION=Environment setting required for all KDE4 apps to run.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=4/4.11
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e78c164057f6578b7b87375ecbc4a1dd
+_md5_=6f5ccff83cdf103df42e4568af59f5a1
diff --git a/metadata/md5-cache/kde-base/kde-l10n-4.11.5 b/metadata/md5-cache/kde-base/kde-l10n-4.11.5
index aea06662ea77..376284a63069 100644
--- a/metadata/md5-cache/kde-base/kde-l10n-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-l10n-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
 IUSE=linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_lv linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<kde-base/konq-plugins-4.6 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ar-4.11.5.tar.xz ) linguas_bg? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-bg-4.11.5.tar.xz ) linguas_bs? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-bs-4.11.5.tar.xz ) linguas_ca? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ca-4.11.5.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ca@valencia-4.11.5.tar.xz ) linguas_cs? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-cs-4.11.5.tar.xz ) linguas_da? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-da-4.11.5.tar.xz ) linguas_de? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-de-4.11.5.tar.xz ) linguas_el? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-el-4.11.5.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-en_GB-4.11.5.tar.xz ) linguas_es? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-es-4.11.5.tar.xz ) linguas_et? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-et-4.11.5.tar.xz ) linguas_eu? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-eu-4.11.5.tar.xz ) linguas_fa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fa-4.11.5.tar.xz ) linguas_fi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fi-4.11.5.tar.xz ) linguas_fr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fr-4.11.5.tar.xz ) linguas_ga? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ga-4.11.5.tar.xz ) linguas_gl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-gl-4.11.5.tar.xz ) linguas_he? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-he-4.11.5.tar.xz ) linguas_hi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hi-4.11.5.tar.xz ) linguas_hr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hr-4.11.5.tar.xz ) linguas_hu? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hu-4.11.5.tar.xz ) linguas_ia? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ia-4.11.5.tar.xz ) linguas_is? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-is-4.11.5.tar.xz ) linguas_it? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-it-4.11.5.tar.xz ) linguas_ja? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ja-4.11.5.tar.xz ) linguas_kk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-kk-4.11.5.tar.xz ) linguas_km? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-km-4.11.5.tar.xz ) linguas_ko? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ko-4.11.5.tar.xz ) linguas_lt? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-lt-4.11.5.tar.xz ) linguas_lv? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-lv-4.11.5.tar.xz ) linguas_mr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-mr-4.11.5.tar.xz ) linguas_nb? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nb-4.11.5.tar.xz ) linguas_nds? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nds-4.11.5.tar.xz ) linguas_nl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nl-4.11.5.tar.xz ) linguas_nn? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nn-4.11.5.tar.xz ) linguas_pa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pa-4.11.5.tar.xz ) linguas_pl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pl-4.11.5.tar.xz ) linguas_pt? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pt-4.11.5.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pt_BR-4.11.5.tar.xz ) linguas_ro? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ro-4.11.5.tar.xz ) linguas_ru? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ru-4.11.5.tar.xz ) linguas_sk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sk-4.11.5.tar.xz ) linguas_sl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sl-4.11.5.tar.xz ) linguas_sr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sr-4.11.5.tar.xz ) linguas_sv? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sv-4.11.5.tar.xz ) linguas_tg? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-tg-4.11.5.tar.xz ) linguas_tr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-tr-4.11.5.tar.xz ) linguas_ug? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ug-4.11.5.tar.xz ) linguas_uk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-uk-4.11.5.tar.xz ) linguas_vi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-vi-4.11.5.tar.xz ) linguas_wa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-wa-4.11.5.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-zh_CN-4.11.5.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-zh_TW-4.11.5.tar.xz )
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=211769f99779fc036956a5a73c0d8410
+_md5_=5e48a0136685c2a56e6cd74139055914
diff --git a/metadata/md5-cache/kde-base/kde-meta-4.11.5 b/metadata/md5-cache/kde-base/kde-meta-4.11.5
index d9d7513f4bb6..915b248ab123 100644
--- a/metadata/md5-cache/kde-base/kde-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE - merge this to pull in all split kde-base/* packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=accessibility nls sdk semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kate-4.11.5:4[aqua=] >=kde-base/kdeadmin-meta-4.11.5:4[aqua=] >=kde-base/kdeartwork-meta-4.11.5:4[aqua=] >=kde-base/kdebase-meta-4.11.5:4[aqua=] >=kde-base/kdeedu-meta-4.11.5:4[aqua=] >=kde-base/kdegames-meta-4.11.5:4[aqua=] >=kde-base/kdegraphics-meta-4.11.5:4[aqua=] >=kde-base/kdemultimedia-meta-4.11.5:4[aqua=] >=kde-base/kdenetwork-meta-4.11.5:4[aqua=] >=kde-base/kdeplasma-addons-4.11.5:4[aqua=] >=kde-base/kdetoys-meta-4.11.5:4[aqua=] >=kde-base/kdeutils-meta-4.11.5:4[aqua=] accessibility? ( >=kde-base/kdeaccessibility-meta-4.11.5:4[aqua=] ) nls? ( >=kde-base/kde-l10n-4.11.5:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.11.5:4[aqua=] >=kde-base/kdesdk-meta-4.11.5:4[aqua=] >=kde-base/kdewebdev-meta-4.11.5:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepim-meta-4.4.11.1:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d8637a131e60d7582d6d4162291ab29c
+_md5_=52304b258759a75b435015b3f1e20db4
diff --git a/metadata/md5-cache/kde-base/kde-meta-4.12.1 b/metadata/md5-cache/kde-base/kde-meta-4.12.1
index 828b25c5a884..788e4cdc3517 100644
--- a/metadata/md5-cache/kde-base/kde-meta-4.12.1
+++ b/metadata/md5-cache/kde-base/kde-meta-4.12.1
@@ -3,9 +3,9 @@ DESCRIPTION=KDE - merge this to pull in all split kde-base/* packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=accessibility nls sdk semantic-desktop aqua
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kate-4.12.1:4[aqua=] >=kde-base/kdeadmin-meta-4.12.1:4[aqua=] >=kde-base/kdeartwork-meta-4.12.1:4[aqua=] >=kde-base/kdebase-meta-4.12.1:4[aqua=] >=kde-base/kdeedu-meta-4.12.1:4[aqua=] >=kde-base/kdegames-meta-4.12.1:4[aqua=] >=kde-base/kdegraphics-meta-4.12.1:4[aqua=] >=kde-base/kdemultimedia-meta-4.12.1:4[aqua=] >=kde-base/kdenetwork-meta-4.12.1:4[aqua=] >=kde-base/kdeplasma-addons-4.12.1:4[aqua=] >=kde-base/kdetoys-meta-4.12.1:4[aqua=] >=kde-base/kdeutils-meta-4.12.1:4[aqua=] accessibility? ( >=kde-base/kdeaccessibility-meta-4.12.1:4[aqua=] ) nls? ( >=kde-base/kde-l10n-4.12.1:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.12.1:4[aqua=] >=kde-base/kdesdk-meta-4.12.1:4[aqua=] >=kde-base/kdewebdev-meta-4.12.1:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepim-meta-4.4.11.1:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=99b45038c60a5b5c6e7adfe6eeeb50ce
+_md5_=aaa42020465a96e30cec0df226db9dcc
diff --git a/metadata/md5-cache/kde-base/kde-wallpapers-4.11.5 b/metadata/md5-cache/kde-base/kde-wallpapers-4.11.5
index d6293097eb18..23f4545953ec 100644
--- a/metadata/md5-cache/kde-base/kde-wallpapers-4.11.5
+++ b/metadata/md5-cache/kde-base/kde-wallpapers-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE wallpapers
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-wallpapers-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=47f23a5a8afbb899cbd2f69bb536cd8e
+_md5_=100a661119465e9e8299ccaf8a0ebcd9
diff --git a/metadata/md5-cache/kde-base/kdeaccessibility-meta-4.11.5 b/metadata/md5-cache/kde-base/kdeaccessibility-meta-4.11.5
index 33fcdbc02880..8da2fc367dde 100644
--- a/metadata/md5-cache/kde-base/kdeaccessibility-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeaccessibility-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/jovie-4.11.5:4[aqua=] >=kde-base/kaccessible-4.11.5:4[aqua=] >=kde-base/kmag-4.11.5:4[aqua=] >=kde-base/kmousetool-4.11.5:4[aqua=] >=kde-base/kmouth-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1473114b4db8585cfe2ec90c1565b072
+_md5_=2ab3dd4fbcc733c4c6ef0804ea0d58a7
diff --git a/metadata/md5-cache/kde-base/kdeadmin-meta-4.11.5 b/metadata/md5-cache/kde-base/kdeadmin-meta-4.11.5
index 7f4f6c757cdb..a4f038448205 100644
--- a/metadata/md5-cache/kde-base/kdeadmin-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeadmin-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derive
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kcron-4.11.5:4[aqua=] >=kde-base/ksystemlog-4.11.5:4[aqua=] >=kde-base/kuser-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=47a48ee99336b3b63ce4b18ad542faea
+_md5_=0d5c4eec23ed8a5c7cf24aeda58b5abc
diff --git a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.11.5
index c87415f3007e..60e2d1e6bd37 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-colorschemes-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE extra colorschemes
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8fa63302fde226f3452b7cf3a05c8345
+_md5_=bef0c7e467c5045214c326c7cbeec879
diff --git a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.11.5
index 7f23e6161d23..1434dec1a69d 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-desktopthemes-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Additional KDE4 Plasma themes
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b2087bb471892db550a19067a3b85102
+_md5_=ac60f569b0721090e10cc5e01d386760
diff --git a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.11.5
index 916db55c2c18..10f1f0035363 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-emoticons-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=EmotIcons (icons for things like smilies :-) for kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=binchecks strip
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aa3e86d11942d8f8aef6c04ee58f4226
+_md5_=d5e8583334edfbb1ec2c58f584a0dfaa
diff --git a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.11.5
index 5227d315f99c..514c3970e50f 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-iconthemes-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Icon themes for kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!x11-themes/nuvola >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e8e55f62fb546c296f5552104b5f8556
+_md5_=9971bff542f4d74a19725dd751467784
diff --git a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.11.5
index c2e0b74db54d..2b3f64163ab2 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-kscreensaver-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Extra screensavers for kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +eigen +kexiv2 xscreensaver opengl aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] media-libs/libart_lgpl x11-libs/libX11 x11-libs/libXt kexiv2? ( >=kde-base/libkexiv2-4.11.5:4[aqua=] ) virtual/glu virtual/opengl xscreensaver? ( x11-misc/xscreensaver ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c4af90d211f2d098a7fb2e1c64938cfa
+_md5_=1626ab6f9a2b928c7f1a2905f604a07c
diff --git a/metadata/md5-cache/kde-base/kdeartwork-meta-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-meta-4.11.5
index 77b764091c49..9e17e028d934 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdeartwork - merge this to pull in all kdeartwork-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kdeartwork-colorschemes-4.11.5:4[aqua=] >=kde-base/kdeartwork-desktopthemes-4.11.5:4[aqua=] >=kde-base/kdeartwork-emoticons-4.11.5:4[aqua=] >=kde-base/kdeartwork-iconthemes-4.11.5:4[aqua=] >=kde-base/kdeartwork-kscreensaver-4.11.5:4[aqua=] >=kde-base/kdeartwork-sounds-4.11.5:4[aqua=] >=kde-base/kdeartwork-styles-4.11.5:4[aqua=] >=kde-base/kdeartwork-wallpapers-4.11.5:4[aqua=] >=kde-base/kdeartwork-weatherwallpapers-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7c09fb4ee76b65296486c031f5dff98d
+_md5_=5f55b6782ec2b03358d04600cf0bc9e6
diff --git a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.11.5
index fb2736d7fa04..279838f25d91 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-sounds-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-sounds-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Extra sound themes for kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=binchecks strip
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cc33830b6416a446d70e8674ab0d34fe
+_md5_=f1e273a3f6dd6aa9f5cdb5e59c55791f
diff --git a/metadata/md5-cache/kde-base/kdeartwork-styles-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-styles-4.11.5
index ce3af7b5ce66..55139c5cce4d 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-styles-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-styles-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Extra KWin styles and window decorations
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kwin-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=64ba2aec85dc37921a759ed780a7de1a
+_md5_=3d8626280f2673d1aeffb778b78e2103
diff --git a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.11.5
index 38807ae6338d..ecce6e803101 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-wallpapers-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Wallpapers from kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<kde-base/kde-wallpapers-4.9.50:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=binchecks strip
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=83b1f2a9edf11f239340a9d86ef65f96
+_md5_=ae9ca3aa08d535cbcf7839c9018dacf4
diff --git a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.11.5 b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.11.5
index b4a2d1b89697..fa44746ee59c 100644
--- a/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeartwork-weatherwallpapers-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Weather aware wallpapers. Changes with weather outside.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdeartwork-wallpapers-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeartwork-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1ee86e2a3b400bed135888ee15c3e7d2
+_md5_=f0d6c311030dd6297ffa8ef6fdbf0ee3
diff --git a/metadata/md5-cache/kde-base/kdebase-cursors-4.11.5 b/metadata/md5-cache/kde-base/kdebase-cursors-4.11.5
index 89643b593682..a2f171e29ecb 100644
--- a/metadata/md5-cache/kde-base/kdebase-cursors-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-cursors-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=oxygen cursors from kdebase
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=19294912395c176c1908ca86edb9db75
+_md5_=fa1525fc7ed6308577842f1428d317a3
diff --git a/metadata/md5-cache/kde-base/kdebase-data-4.11.5 b/metadata/md5-cache/kde-base/kdebase-data-4.11.5
index bfe06950df58..e9bf0d5a8636 100644
--- a/metadata/md5-cache/kde-base/kdebase-data-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-data-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Icons, localization data and various .desktop files from kdebase.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+wallpapers aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=wallpapers? ( >=kde-base/kde-wallpapers-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] x11-themes/hicolor-icon-theme >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c14e1c367bac2880f9658440ce45432f
+_md5_=fa5987c7b69a181da03db7ba5acc6aef
diff --git a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.11.5 b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.11.5
index 5affa1b8c657..d1f4930d4e90 100644
--- a/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-desktoptheme-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Oxygen KDE4 desktop theme.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fed1fdc026b8eed450191a19b6d1939a
+_md5_=39f6ef55ba3a9691c515413c2050d6bc
diff --git a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.11.5 b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.11.5
index 59e1b3aaccbc..5ff35cf08328 100644
--- a/metadata/md5-cache/kde-base/kdebase-kioslaves-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-kioslaves-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=kioslave: the kde VFS framework - kioslave plugins present a filesys
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+bzip2 exif debug lzma openexr samba +sftp +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 !aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 ) exif? ( media-gfx/exiv2:= ) openexr? ( media-libs/openexr:= ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.4.0:=[sftp] ) >=kde-base/kdelibs-4.11.5:4[aqua=,bzip2?,lzma?] >=kde-base/kdialog-4.11.5:4[aqua=] virtual/ssh !aqua? ( !kernel_SunOS? ( virtual/eject ) ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dae52fd7453d63275601df529df2f1c1
+_md5_=a0d9fafef6851de4e084154fdfe9972a
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-4.11.5 b/metadata/md5-cache/kde-base/kdebase-menu-4.11.5
index 79f7525264f5..e9375d4f8dfc 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-menu-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Menu query tool.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dc45ca636184e1ceb4b646f8a97ee398
+_md5_=a4c5a048b30888a0aa494f4dde1d2a94
diff --git a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.11.5 b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.11.5
index a8006c50e21e..9fc7aa9fc4c6 100644
--- a/metadata/md5-cache/kde-base/kdebase-menu-icons-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-menu-icons-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE menu icons
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cb8712d4b87b49dc2c6d6e9c7e7aec0c
+_md5_=783383cc6c04f023fba83e3b967b3402
diff --git a/metadata/md5-cache/kde-base/kdebase-meta-4.11.5 b/metadata/md5-cache/kde-base/kdebase-meta-4.11.5
index 0409078948f2..b0b60e08cd40 100644
--- a/metadata/md5-cache/kde-base/kdebase-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all kdebase-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+wallpapers aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/dolphin-4.11.5:4[aqua=] >=kde-base/freespacenotifier-4.11.5:4[aqua=] >=kde-base/kcheckpass-4.11.5:4[aqua=] >=kde-base/kcminit-4.11.5:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.11.5:4[aqua=] ) >=kde-base/kde-base-artwork-4.11.5:4[aqua=] >=kde-base/kdebase-cursors-4.11.5:4[aqua=] >=kde-base/kdebase-runtime-meta-4.11.5:4[aqua=] >=kde-base/kdebase-startkde-4.11.5:4[aqua=] >=kde-base/kdepasswd-4.11.5:4[aqua=] >=kde-base/kdialog-4.11.5:4[aqua=] >=kde-base/keditbookmarks-4.11.5:4[aqua=] >=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/kfind-4.11.5:4[aqua=] >=kde-base/kfmclient-4.11.5:4[aqua=] >=kde-base/khotkeys-4.11.5:4[aqua=] >=kde-base/kinfocenter-4.11.5:4[aqua=] >=kde-base/klipper-4.11.5:4[aqua=] >=kde-base/kmenuedit-4.11.5:4[aqua=] >=kde-base/konq-plugins-4.11.5:4[aqua=] >=kde-base/konqueror-4.11.5:4[aqua=] >=kde-base/konsole-4.11.5:4[aqua=] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/kscreensaver-4.11.5:4[aqua=] >=kde-base/ksmserver-4.11.5:4[aqua=] >=kde-base/ksplash-4.11.5:4[aqua=] >=kde-base/kstartupconfig-4.11.5:4[aqua=] >=kde-base/kstyles-4.11.5:4[aqua=] >=kde-base/ksysguard-4.11.5:4[aqua=] >=kde-base/ksystraycmd-4.11.5:4[aqua=] >=kde-base/kwin-4.11.5:4[aqua=] >=kde-base/kwrite-4.11.5:4[aqua=] >=kde-base/kwrited-4.11.5:4[aqua=] >=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/liboxygenstyle-4.11.5:4[aqua=] >=kde-base/libplasmaclock-4.11.5:4[aqua=] >=kde-base/libplasmagenericshell-4.11.5:4[aqua=] >=kde-base/libtaskmanager-4.11.5:4[aqua=] >=kde-base/nsplugins-4.11.5:4[aqua=] >=kde-base/phonon-kde-4.11.5:4[aqua=] >=kde-base/plasma-apps-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=] >=kde-base/powerdevil-4.11.5:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.11.5:4[aqua=] >=kde-base/solid-actions-kcm-4.11.5:4[aqua=] >=kde-base/systemsettings-4.11.5:4[aqua=] !prefix? ( >=kde-base/kdm-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=088f4bb6466e2350b1ce1782e07377a7
+_md5_=8ea2ac450b6053d3420d6d40c8220082
diff --git a/metadata/md5-cache/kde-base/kdebase-runtime-meta-4.11.5 b/metadata/md5-cache/kde-base/kdebase-runtime-meta-4.11.5
index 26f7321f1941..082a58d38bba 100644
--- a/metadata/md5-cache/kde-base/kdebase-runtime-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-runtime-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all kdebase-runtime-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+handbook semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/attica-4.11.5:4[aqua=] >=kde-base/kcmshell-4.11.5:4[aqua=] >=kde-base/kcontrol-4.11.5:4[aqua=] >=kde-base/kdebase-data-4.11.5:4[aqua=] >=kde-base/kdebase-desktoptheme-4.11.5:4[aqua=] >=kde-base/kdebase-kioslaves-4.11.5:4[aqua=] >=kde-base/kdebase-menu-4.11.5:4[aqua=] >=kde-base/kdebase-menu-icons-4.11.5:4[aqua=] >=kde-base/kdebugdialog-4.11.5:4[aqua=] >=kde-base/kdesu-4.11.5:4[aqua=] >=kde-base/kdontchangethehostname-4.11.5:4[aqua=] >=kde-base/keditfiletype-4.11.5:4[aqua=] >=kde-base/kfile-4.11.5:4[aqua=] >=kde-base/kglobalaccel-4.11.5:4[aqua=] >=kde-base/kiconfinder-4.11.5:4[aqua=] >=kde-base/kimgio-4.11.5:4[aqua=] >=kde-base/kioclient-4.11.5:4[aqua=] >=kde-base/kmimetypefinder-4.11.5:4[aqua=] >=kde-base/knetattach-4.11.5:4[aqua=] >=kde-base/knewstuff-4.11.5:4[aqua=] >=kde-base/kpasswdserver-4.11.5:4[aqua=] >=kde-base/kquitapp-4.11.5:4[aqua=] >=kde-base/kstart-4.11.5:4[aqua=] >=kde-base/ktimezoned-4.11.5:4[aqua=] >=kde-base/ktraderclient-4.11.5:4[aqua=] >=kde-base/kuiserver-4.11.5:4[aqua=] >=kde-base/kurifilter-plugins-4.11.5:4[aqua=] >=kde-base/kwallet-4.11.5:4[aqua=] >=kde-base/kwalletd-4.11.5:4[aqua=] >=kde-base/plasma-runtime-4.11.5:4[aqua=] >=kde-base/renamedlg-plugins-4.11.5:4[aqua=] >=kde-base/solid-runtime-4.11.5:4[aqua=] handbook? ( >=kde-base/khelpcenter-4.11.5:4[aqua=] ) semantic-desktop? ( >=kde-base/drkonqi-4.11.5:4[aqua=] >=kde-base/nepomuk-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e9fea58e48965be119fc15cf79e6de84
+_md5_=de82cb5c196aa2ae81a4d4ad55df27d0
diff --git a/metadata/md5-cache/kde-base/kdebase-startkde-4.11.5 b/metadata/md5-cache/kde-base/kdebase-startkde-4.11.5
index ff01534abfbd..d3c0a7d1bc48 100644
--- a/metadata/md5-cache/kde-base/kdebase-startkde-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebase-startkde-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Startkde script, which starts a complete KDE session, and associated
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+wallpapers aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.11.5:4[aqua=] >=kde-base/kdebase-runtime-meta-4.11.5:4[aqua=] wallpapers? ( >=kde-base/kde-wallpapers-4.11.5:4[aqua=] ) >=kde-base/kfmclient-4.11.5:4[aqua=] >=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/kreadconfig-4.11.5:4[aqua=] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/ksmserver-4.11.5:4[aqua=] >=kde-base/ksplash-4.11.5:4[aqua=] >=kde-base/kstartupconfig-4.11.5:4[aqua=] >=kde-base/kwin-4.11.5:4[aqua=] >=kde-base/phonon-kde-4.11.5:4[aqua=] >=kde-base/plasma-apps-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=] >=kde-base/systemsettings-4.11.5: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.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3cca7d976a3041eef37630c1572ee8f9
+_md5_=3dd0688857cea4afd60cd08944fe5fde
diff --git a/metadata/md5-cache/kde-base/kdebindings-meta-4.11.5 b/metadata/md5-cache/kde-base/kdebindings-meta-4.11.5
index 37dec824043b..b23bee04b0de 100644
--- a/metadata/md5-cache/kde-base/kdebindings-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebindings-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE bindings - merge this to pull in all kdebindings-derived package
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=csharp java perl python ruby aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/smokegen-4.11.5:4[aqua=] >=kde-base/smokekde-4.11.5:4[aqua=] >=kde-base/smokeqt-4.11.5:4[aqua=] csharp? ( >=kde-base/kimono-4.11.5:4[aqua=] >=kde-base/qyoto-4.11.5:4[aqua=] ) java? ( >=kde-base/krossjava-4.11.5:4[aqua=] ) perl? ( >=kde-base/perlkde-4.11.5:4[aqua=] >=kde-base/perlqt-4.11.5:4[aqua=] ) python? ( >=kde-base/krosspython-4.11.5:4[aqua=] >=kde-base/pykde4-4.11.5:4[aqua=] ) ruby? ( >=kde-base/korundum-4.11.5:4[aqua=] >=kde-base/krossruby-4.11.5:4[aqua=] >=kde-base/qtruby-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7af39b5aa7b6d665e65dba578472b563
+_md5_=75b3c2097555b17c5c93d60295a84a23
diff --git a/metadata/md5-cache/kde-base/kdebugdialog-4.11.5 b/metadata/md5-cache/kde-base/kdebugdialog-4.11.5
index 85d96fc7d6cd..0ff4fe59ee21 100644
--- a/metadata/md5-cache/kde-base/kdebugdialog-4.11.5
+++ b/metadata/md5-cache/kde-base/kdebugdialog-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A dialog box for setting preferences for debug output
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=11d21325a7bca4425a904e2026664d77
+_md5_=7319baefcdb499cbea9fca360090fe36
diff --git a/metadata/md5-cache/kde-base/kdeedu-meta-4.11.5 b/metadata/md5-cache/kde-base/kdeedu-meta-4.11.5
index 3817853f0153..0b085e12354c 100644
--- a/metadata/md5-cache/kde-base/kdeedu-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeedu-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived pack
 EAPI=5
 HOMEPAGE=http://edu.kde.org
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/analitza-4.11.5:4[aqua=] >=kde-base/blinken-4.11.5:4[aqua=] >=kde-base/cantor-4.11.5:4[aqua=] >=kde-base/kalgebra-4.11.5:4[aqua=] >=kde-base/kalzium-4.11.5:4[aqua=] >=kde-base/kanagram-4.11.5:4[aqua=] >=kde-base/kbruch-4.11.5:4[aqua=] >=kde-base/kgeography-4.11.5:4[aqua=] >=kde-base/khangman-4.11.5:4[aqua=] >=kde-base/kig-4.11.5:4[aqua=] >=kde-base/kiten-4.11.5:4[aqua=] >=kde-base/klettres-4.11.5:4[aqua=] >=kde-base/kmplot-4.11.5:4[aqua=] >=kde-base/kstars-4.11.5:4[aqua=] >=kde-base/ktouch-4.11.5:4[aqua=] >=kde-base/kturtle-4.11.5:4[aqua=] >=kde-base/kwordquiz-4.11.5:4[aqua=] >=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/marble-4.11.5:4[aqua=] >=kde-base/pairs-4.11.5:4[aqua=] >=kde-base/parley-4.11.5:4[aqua=] !ppc64? ( >=kde-base/rocs-4.11.5:4[aqua=] ) >=kde-base/step-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e7f0900f8be8ad61b26a485b78d978a5
+_md5_=89f054e2df25ea527c570d8949f9c3bd
diff --git a/metadata/md5-cache/kde-base/kdegames-meta-4.11.5 b/metadata/md5-cache/kde-base/kdegames-meta-4.11.5
index c22b2e0e6dfd..b514cfbbf629 100644
--- a/metadata/md5-cache/kde-base/kdegames-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdegames-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
 EAPI=5
 HOMEPAGE=http://games.kde.org/
 IUSE=opengl python aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/bomber-4.11.5:4[aqua=] >=kde-base/bovo-4.11.5:4[aqua=] >=kde-base/granatier-4.11.5:4[aqua=] >=kde-base/kapman-4.11.5:4[aqua=] >=kde-base/katomic-4.11.5:4[aqua=] >=kde-base/kblackbox-4.11.5:4[aqua=] >=kde-base/kblocks-4.11.5:4[aqua=] >=kde-base/kbounce-4.11.5:4[aqua=] >=kde-base/kbreakout-4.11.5:4[aqua=] >=kde-base/kdiamond-4.11.5:4[aqua=] >=kde-base/kfourinline-4.11.5:4[aqua=] >=kde-base/kgoldrunner-4.11.5:4[aqua=] >=kde-base/killbots-4.11.5:4[aqua=] >=kde-base/kigo-4.11.5:4[aqua=] >=kde-base/kiriki-4.11.5:4[aqua=] >=kde-base/kjumpingcube-4.11.5:4[aqua=] >=kde-base/klickety-4.11.5:4[aqua=] >=kde-base/klines-4.11.5:4[aqua=] >=kde-base/kmahjongg-4.11.5:4[aqua=] >=kde-base/kmines-4.11.5:4[aqua=] >=kde-base/knavalbattle-4.11.5:4[aqua=] >=kde-base/knetwalk-4.11.5:4[aqua=] >=kde-base/kolf-4.11.5:4[aqua=] >=kde-base/kollision-4.11.5:4[aqua=] >=kde-base/konquest-4.11.5:4[aqua=] >=kde-base/kpat-4.11.5:4[aqua=] >=kde-base/kreversi-4.11.5:4[aqua=] >=kde-base/kshisen-4.11.5:4[aqua=] >=kde-base/ksirk-4.11.5:4[aqua=] >=kde-base/ksnakeduel-4.11.5:4[aqua=] >=kde-base/kspaceduel-4.11.5:4[aqua=] >=kde-base/ksquares-4.11.5:4[aqua=] >=kde-base/ktuberling-4.11.5:4[aqua=] >=kde-base/kubrick-4.11.5:4[aqua=] >=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/libkmahjongg-4.11.5:4[aqua=] >=kde-base/lskat-4.11.5:4[aqua=] >=kde-base/palapeli-4.11.5:4[aqua=] >=kde-base/picmi-4.11.5:4[aqua=] opengl? ( >=kde-base/ksudoku-4.11.5:4[aqua=] ) python? ( >=kde-base/kajongg-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5a6e833685500786c3c4d7daf6fc2be1
+_md5_=b267f136851bd6deb6785faae0ee1449
diff --git a/metadata/md5-cache/kde-base/kdegames-meta-4.12.1 b/metadata/md5-cache/kde-base/kdegames-meta-4.12.1
index 004f31dc02cd..aa4fd1da74ae 100644
--- a/metadata/md5-cache/kde-base/kdegames-meta-4.12.1
+++ b/metadata/md5-cache/kde-base/kdegames-meta-4.12.1
@@ -3,9 +3,9 @@ DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
 EAPI=5
 HOMEPAGE=http://games.kde.org/
 IUSE=opengl python aqua
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/bomber-4.12.1:4[aqua=] >=kde-base/bovo-4.12.1:4[aqua=] >=kde-base/granatier-4.12.1:4[aqua=] >=kde-base/kapman-4.12.1:4[aqua=] >=kde-base/katomic-4.12.1:4[aqua=] >=kde-base/kblackbox-4.12.1:4[aqua=] >=kde-base/kblocks-4.12.1:4[aqua=] >=kde-base/kbounce-4.12.1:4[aqua=] >=kde-base/kbreakout-4.12.1:4[aqua=] >=kde-base/kdiamond-4.12.1:4[aqua=] >=kde-base/kfourinline-4.12.1:4[aqua=] >=kde-base/kgoldrunner-4.12.1:4[aqua=] >=kde-base/killbots-4.12.1:4[aqua=] >=kde-base/kigo-4.12.1:4[aqua=] >=kde-base/kiriki-4.12.1:4[aqua=] >=kde-base/kjumpingcube-4.12.1:4[aqua=] >=kde-base/klickety-4.12.1:4[aqua=] >=kde-base/klines-4.12.1:4[aqua=] >=kde-base/kmahjongg-4.12.1:4[aqua=] >=kde-base/kmines-4.12.1:4[aqua=] >=kde-base/knavalbattle-4.12.1:4[aqua=] >=kde-base/knetwalk-4.12.1:4[aqua=] >=kde-base/kolf-4.12.1:4[aqua=] >=kde-base/kollision-4.12.1:4[aqua=] >=kde-base/konquest-4.12.1:4[aqua=] >=kde-base/kpat-4.12.1:4[aqua=] >=kde-base/kreversi-4.12.1:4[aqua=] >=kde-base/kshisen-4.12.1:4[aqua=] >=kde-base/ksirk-4.12.1:4[aqua=] >=kde-base/ksnakeduel-4.12.1:4[aqua=] >=kde-base/kspaceduel-4.12.1:4[aqua=] >=kde-base/ksquares-4.12.1:4[aqua=] >=kde-base/ktuberling-4.12.1:4[aqua=] >=kde-base/kubrick-4.12.1:4[aqua=] >=kde-base/libkdegames-4.12.1:4[aqua=] >=kde-base/libkmahjongg-4.12.1:4[aqua=] >=kde-base/lskat-4.12.1:4[aqua=] >=kde-base/palapeli-4.12.1:4[aqua=] >=kde-base/picmi-4.12.1:4[aqua=] opengl? ( >=kde-base/ksudoku-4.12.1:4[aqua=] ) python? ( >=kde-base/kajongg-4.12.1:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=41660d388075d0dee6eb8b9e09dbab2d
+_md5_=1d7bb3ecf6decf3cbddcae8d52c7f5fc
diff --git a/metadata/md5-cache/kde-base/kdegraphics-meta-4.11.5 b/metadata/md5-cache/kde-base/kdegraphics-meta-4.11.5
index 346201eeaebd..b383b25cab0c 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdegraphics-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/
 IUSE=scanner aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/gwenview-4.11.5:4[aqua=] >=kde-base/kamera-4.11.5:4[aqua=] >=kde-base/kcolorchooser-4.11.5:4[aqua=] >=kde-base/kdegraphics-mobipocket-4.11.5:4[aqua=] >=kde-base/kgamma-4.11.5:4[aqua=] >=kde-base/kolourpaint-4.11.5:4[aqua=] >=kde-base/kruler-4.11.5:4[aqua=] >=kde-base/ksnapshot-4.11.5:4[aqua=] >=kde-base/libkdcraw-4.11.5:4[aqua=] >=kde-base/libkexiv2-4.11.5:4[aqua=] >=kde-base/libkipi-4.11.5:4[aqua=] >=kde-base/okular-4.11.5:4[aqua=] >=kde-base/svgpart-4.11.5:4[aqua=] >=kde-base/thumbnailers-4.11.5:4[aqua=] scanner? ( >=kde-base/ksaneplugin-4.11.5:4[aqua=] >=kde-base/libksane-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7ae4fc5a7a402b7fe6109f93640fe01e
+_md5_=02b83e0451d6116773342aa620e9ddc8
diff --git a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.11.5 b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.11.5
index 49cb5e4c61d6..f0bd06b04508 100644
--- a/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.11.5
+++ b/metadata/md5-cache/kde-base/kdegraphics-mobipocket-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Library to support mobipocket ebooks
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/okular-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdegraphics-mobipocket-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0ba03168d0cc7e17e213febd0ba3349d
+_md5_=1b7d8742c0e565ff742ff52d3e63e6b3
diff --git a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.10.5 b/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.10.5
deleted file mode 100644
index 897773464b4a..000000000000
--- a/metadata/md5-cache/kde-base/kdegraphics-strigi-analyzer-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-misc/strigi >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=kdegraphics: strigi plugins
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.10.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kdegraphics-strigi-analyzer-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8630212c4697d0a50e1d907f3d77dc25
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.11.2-r1 b/metadata/md5-cache/kde-base/kdelibs-4.11.2-r1
index 5ab852c70d15..db023f745269 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.11.2-r1
+++ b/metadata/md5-cache/kde-base/kdelibs-4.11.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 DESCRIPTION=KDE libraries needed by all KDE programs.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -7,10 +7,10 @@ IUSE=3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls op
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=>=kde-base/katepart-4.11.2:4[aqua=] || ( >=kde-base/kfmclient-4.11.2:4[aqua=] x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.11.2:4[aqua=] ) policykit? ( >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-core-4.11.2:4[aqua=] >=kde-base/nepomuk-widgets-4.11.2:4[aqua=] )
-RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.11.2:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.11.2:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.11.2:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.11.2:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.2/src/kdelibs-4.11.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0d6c79a7b33c9cc9282fef05b93d9662
+_md5_=d90f0055ed1374681c05e8883c054f41
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.11.5 b/metadata/md5-cache/kde-base/kdelibs-4.11.5
index e76c63ac5720..dd2ee977f1e2 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.11.5
+++ b/metadata/md5-cache/kde-base/kdelibs-4.11.5
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 DESCRIPTION=KDE libraries needed by all KDE programs.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower zeroconf opengl test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=>=kde-base/katepart-4.11.5:4[aqua=] || ( >=kde-base/kfmclient-4.11.5:4[aqua=] x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.11.5:4[aqua=] ) policykit? ( >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-core-4.11.5:4[aqua=] >=kde-base/nepomuk-widgets-4.11.5:4[aqua=] )
-RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.11.5:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.11.5:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdelibs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1d9a63d4414f93d8d5160ef8ab7424ec
+_md5_=8981d96ffe17e7a3b29f6949b1a559f3
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.12.0 b/metadata/md5-cache/kde-base/kdelibs-4.12.0
index fb8fbf4018ac..79a5f1fb2b93 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.12.0
+++ b/metadata/md5-cache/kde-base/kdelibs-4.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 DESCRIPTION=KDE libraries needed by all KDE programs.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -7,10 +7,10 @@ IUSE=3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls op
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=>=kde-base/katepart-4.12.0:4[aqua=] || ( >=kde-base/kfmclient-4.12.0:4[aqua=] x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.12.0:4[aqua=] ) policykit? ( >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-core-4.12.0:4[aqua=] >=kde-base/nepomuk-widgets-4.12.0:4[aqua=] )
-RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.12.0:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.12.0:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.12.0:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.12.0:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.0/src/kdelibs-4.12.0.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=36fc5ebd11cca1ecdc2dde3412ca8386
+_md5_=0824c256fa9eaf34b4ece2acd9f94372
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.12.1 b/metadata/md5-cache/kde-base/kdelibs-4.12.1
index 124d7844ee9c..a93ddb8e0f50 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.12.1
+++ b/metadata/md5-cache/kde-base/kdelibs-4.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 DESCRIPTION=KDE libraries needed by all KDE programs.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -7,10 +7,10 @@ IUSE=3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls op
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=>=kde-base/katepart-4.12.1:4[aqua=] || ( >=kde-base/kfmclient-4.12.1:4[aqua=] x11-misc/xdg-utils ) handbook? ( >=kde-base/khelpcenter-4.12.1:4[aqua=] ) policykit? ( >=sys-auth/polkit-kde-agent-0.99 ) semantic-desktop? ( >=kde-base/nepomuk-core-4.12.1:4[aqua=] >=kde-base/nepomuk-widgets-4.12.1:4[aqua=] )
-RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.12.1:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.12.1:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
+RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2[qt4] >=dev-libs/libdbusmenu-qt-0.3.2 dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= >=media-libs/phonon-4.4.3 sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.0[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.12.1:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) >=kde-base/oxygen-icons-4.12.1:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kdelibs-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=36576271e6ceeda23996a67d3110f6a4
+_md5_=03686477048278c515085ac2f59aa93f
diff --git a/metadata/md5-cache/kde-base/kdemultimedia-meta-4.11.5 b/metadata/md5-cache/kde-base/kdemultimedia-meta-4.11.5
index 1c62fa5ea980..a68a18464645 100644
--- a/metadata/md5-cache/kde-base/kdemultimedia-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdemultimedia-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived pack
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/multimedia/ http://multimedia.kde.org/
 IUSE=ffmpeg +mplayer aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/dragon-4.11.5:4[aqua=] >=kde-base/juk-4.11.5:4[aqua=] >=kde-base/audiocd-kio-4.11.5:4[aqua=] >=kde-base/kmix-4.11.5:4[aqua=] >=kde-base/kscd-4.11.5:4[aqua=] >=kde-base/libkcddb-4.11.5:4[aqua=] >=kde-base/libkcompactdisc-4.11.5:4[aqua=] mplayer? ( >=kde-base/mplayerthumbs-4.11.5:4[aqua=] ) ffmpeg? ( >=kde-base/ffmpegthumbs-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=95cf7082bff3f95c2fac5689a161a22e
+_md5_=d7d419ff5d45013189d5a6247bb0256f
diff --git a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.11.5 b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.11.5
index 92cf53b64775..fea0d349641c 100644
--- a/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.11.5
+++ b/metadata/md5-cache/kde-base/kdenetwork-filesharing-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=kcontrol filesharing config module for SMB
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdenetwork-filesharing-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=96fa49d99370904a887cddfd996b059d
+_md5_=130c9e00090dcee9b25000eeff6ad01e
diff --git a/metadata/md5-cache/kde-base/kdenetwork-meta-4.11.5 b/metadata/md5-cache/kde-base/kdenetwork-meta-4.11.5
index 8fdb92b99c73..8a633a738fa7 100644
--- a/metadata/md5-cache/kde-base/kdenetwork-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdenetwork-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=ppp aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kdenetwork-filesharing-4.11.5:4[aqua=] >=kde-base/kdnssd-4.11.5:4[aqua=] >=kde-base/kget-4.11.5:4[aqua=] >=kde-base/kopete-4.11.5:4[aqua=] >=kde-base/krdc-4.11.5:4[aqua=] >=kde-base/krfb-4.11.5:4[aqua=] ppp? ( >=kde-base/kppp-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=95ef2cfd93bca3ba94eacb8f132df635
+_md5_=1a9ec507f11ed88559034cb29a1ee1c3
diff --git a/metadata/md5-cache/kde-base/kdepasswd-4.11.5 b/metadata/md5-cache/kde-base/kdepasswd-4.11.5
index 90d07145acfb..607fb46fb598 100644
--- a/metadata/md5-cache/kde-base/kdepasswd-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepasswd-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE GUI for passwd
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/kdesu-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=254a73ec7f295cd0b31884f0ce474eac
+_md5_=c8c52e6a6820c48d878bed60b97a8e47
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.11.5 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.11.5
index 838e3232de9d..25b3bc5a75cf 100644
--- a/metadata/md5-cache/kde-base/kdepim-common-libs-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Common libraries for KDE PIM apps
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.9.52 dev-libs/grantlee >=dev-libs/shared-desktop-ontologies-0.11.0 >=kde-base/kdepimlibs-4.11.5:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !<kde-base/kaddressbook-4.4.90:4 !kde-base/kdepim-wizards:4 !<kde-base/kmail-4.4.80:4 !<kde-base/korganizer-4.5.67:4 !<kde-base/kmail-4.10.95:4 app-crypt/gnupg >=kde-base/kdepim-runtime-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=992895276b81147e417ccb6657c82ab1
+_md5_=43b931cb91a7cc4e9a6d965c81fda792
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.11.5 b/metadata/md5-cache/kde-base/kdepim-icons-4.11.5
index d712794e0644..d7d384804f0b 100644
--- a/metadata/md5-cache/kde-base/kdepim-icons-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE PIM icons
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a229ef1571e8c4dfdbd182f95935312
+_md5_=e44c6f02cc02e696f0a98515d34f0209
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.11.5 b/metadata/md5-cache/kde-base/kdepim-kresources-4.11.5
index 94dd7809f390..ed68d70c9703 100644
--- a/metadata/md5-cache/kde-base/kdepim-kresources-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE PIM groupware plugin collection
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6fce73b1d19d93c190b63d770594da34
+_md5_=82995f8662a509dffcfdd0d7b352d83f
diff --git a/metadata/md5-cache/kde-base/kdepim-l10n-4.11.5 b/metadata/md5-cache/kde-base/kdepim-l10n-4.11.5
index 127547eff423..a75a9af7f143 100644
--- a/metadata/md5-cache/kde-base/kdepim-l10n-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-l10n-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE PIM internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
 IUSE=linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_lv linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_tg linguas_tr linguas_ug linguas_uk linguas_vi linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ar-4.11.5.tar.xz ) linguas_bg? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-bg-4.11.5.tar.xz ) linguas_bs? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-bs-4.11.5.tar.xz ) linguas_ca? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ca-4.11.5.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ca@valencia-4.11.5.tar.xz ) linguas_cs? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-cs-4.11.5.tar.xz ) linguas_da? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-da-4.11.5.tar.xz ) linguas_de? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-de-4.11.5.tar.xz ) linguas_el? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-el-4.11.5.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-en_GB-4.11.5.tar.xz ) linguas_es? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-es-4.11.5.tar.xz ) linguas_et? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-et-4.11.5.tar.xz ) linguas_eu? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-eu-4.11.5.tar.xz ) linguas_fa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fa-4.11.5.tar.xz ) linguas_fi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fi-4.11.5.tar.xz ) linguas_fr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-fr-4.11.5.tar.xz ) linguas_ga? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ga-4.11.5.tar.xz ) linguas_gl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-gl-4.11.5.tar.xz ) linguas_he? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-he-4.11.5.tar.xz ) linguas_hi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hi-4.11.5.tar.xz ) linguas_hr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hr-4.11.5.tar.xz ) linguas_hu? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-hu-4.11.5.tar.xz ) linguas_ia? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ia-4.11.5.tar.xz ) linguas_is? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-is-4.11.5.tar.xz ) linguas_it? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-it-4.11.5.tar.xz ) linguas_ja? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ja-4.11.5.tar.xz ) linguas_kk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-kk-4.11.5.tar.xz ) linguas_km? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-km-4.11.5.tar.xz ) linguas_ko? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ko-4.11.5.tar.xz ) linguas_lt? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-lt-4.11.5.tar.xz ) linguas_lv? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-lv-4.11.5.tar.xz ) linguas_mr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-mr-4.11.5.tar.xz ) linguas_nb? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nb-4.11.5.tar.xz ) linguas_nds? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nds-4.11.5.tar.xz ) linguas_nl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nl-4.11.5.tar.xz ) linguas_nn? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-nn-4.11.5.tar.xz ) linguas_pa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pa-4.11.5.tar.xz ) linguas_pl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pl-4.11.5.tar.xz ) linguas_pt? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pt-4.11.5.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-pt_BR-4.11.5.tar.xz ) linguas_ro? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ro-4.11.5.tar.xz ) linguas_ru? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ru-4.11.5.tar.xz ) linguas_sk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sk-4.11.5.tar.xz ) linguas_sl? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sl-4.11.5.tar.xz ) linguas_sr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sr-4.11.5.tar.xz ) linguas_sv? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-sv-4.11.5.tar.xz ) linguas_tg? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-tg-4.11.5.tar.xz ) linguas_tr? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-tr-4.11.5.tar.xz ) linguas_ug? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-ug-4.11.5.tar.xz ) linguas_uk? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-uk-4.11.5.tar.xz ) linguas_vi? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-vi-4.11.5.tar.xz ) linguas_wa? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-wa-4.11.5.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-zh_CN-4.11.5.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.11.5/src/kde-l10n/kde-l10n-zh_TW-4.11.5.tar.xz )
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=da7462f449db3956602da8a355a71826
+_md5_=64c5825eb8dbcc89919abf7ce7609cbc
diff --git a/metadata/md5-cache/kde-base/kdepim-meta-4.11.5 b/metadata/md5-cache/kde-base/kdepim-meta-4.11.5
index d84ecad561f0..25e73ce9409b 100644
--- a/metadata/md5-cache/kde-base/kdepim-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdepim - merge this to pull in all kdepim-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://community.kde.org/KDE_PIM
 IUSE=nls aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/akonadiconsole-4.11.5:4[aqua=] >=kde-base/akregator-4.11.5:4[aqua=] >=kde-base/blogilo-4.11.5:4[aqua=] >=kde-base/kabcclient-4.11.5:4[aqua=] >=kde-base/kaddressbook-4.11.5:4[aqua=] >=kde-base/kalarm-4.11.5:4[aqua=] >=kde-base/kdepim-icons-4.11.5:4[aqua=] >=kde-base/kdepim-kresources-4.11.5:4[aqua=] >=kde-base/kdepim-runtime-4.11.5:4[aqua=] >=kde-base/kjots-4.11.5:4[aqua=] >=kde-base/kleopatra-4.11.5:4[aqua=] >=kde-base/kmail-4.11.5:4[aqua=] >=kde-base/knode-4.11.5:4[aqua=] >=kde-base/knotes-4.11.5:4[aqua=] >=kde-base/konsolekalendar-4.11.5:4[aqua=] >=kde-base/kontact-4.11.5:4[aqua=] >=kde-base/korganizer-4.11.5:4[aqua=] >=kde-base/ktimetracker-4.11.5:4[aqua=] >=kde-base/ktnef-4.11.5:4[aqua=] nls? ( >=kde-base/kde-l10n-4.11.5:4[aqua=] >=kde-base/kdepim-l10n-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c15526f8d0130f19f77ceb3d7ae0ea5f
+_md5_=3ef87f280d12f1fe40cc41fb58302e49
diff --git a/metadata/md5-cache/kde-base/kdepim-meta-4.12.1 b/metadata/md5-cache/kde-base/kdepim-meta-4.12.1
index 06bbbad1013f..5533f788c927 100644
--- a/metadata/md5-cache/kde-base/kdepim-meta-4.12.1
+++ b/metadata/md5-cache/kde-base/kdepim-meta-4.12.1
@@ -3,9 +3,9 @@ DESCRIPTION=kdepim - merge this to pull in all kdepim-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://community.kde.org/KDE_PIM
 IUSE=nls aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/akonadiconsole-4.12.1:4[aqua=] >=kde-base/akregator-4.12.1:4[aqua=] >=kde-base/blogilo-4.12.1:4[aqua=] >=kde-base/calendarjanitor-4.12.1:4[aqua=] >=kde-base/contactthemeeditor-4.12.1:4[aqua=] >=kde-base/kabcclient-4.12.1:4[aqua=] >=kde-base/kaddressbook-4.12.1:4[aqua=] >=kde-base/kalarm-4.12.1:4[aqua=] >=kde-base/kdepim-icons-4.12.1:4[aqua=] >=kde-base/kdepim-kresources-4.12.1:4[aqua=] >=kde-base/kdepim-runtime-4.12.1:4[aqua=] >=kde-base/kjots-4.12.1:4[aqua=] >=kde-base/kleopatra-4.12.1:4[aqua=] >=kde-base/kmail-4.12.1:4[aqua=] >=kde-base/knode-4.12.1:4[aqua=] >=kde-base/knotes-4.12.1:4[aqua=] >=kde-base/konsolekalendar-4.12.1:4[aqua=] >=kde-base/kontact-4.12.1:4[aqua=] >=kde-base/korganizer-4.12.1:4[aqua=] >=kde-base/ktimetracker-4.12.1:4[aqua=] >=kde-base/ktnef-4.12.1:4[aqua=] nls? ( >=kde-base/kde-l10n-4.12.1:4[aqua=] >=kde-base/kdepim-l10n-4.12.1:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bc341d78c796ff90c3d0eed2c2e25390
+_md5_=7adb80eda1f18159f475d3e7b10ca6b1
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.11.5 b/metadata/md5-cache/kde-base/kdepim-runtime-4.11.5
index beeb51bb9756..ec5212ad84c9 100644
--- a/metadata/md5-cache/kde-base/kdepim-runtime-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE PIM runtime plugin collection
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug facebook google kolab aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=app-office/akonadi-server-1.9.52 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-libs/shared-desktop-ontologies-0.11.0 >=kde-base/kdepimlibs-4.11.5:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0 ) kolab? ( net-libs/libkolab ) >=kde-base/kdepim-icons-4.11.5:4[aqua=] !kde-misc/akonadi-google !kde-misc/akonadi-facebook >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=396738543c1f67903879d78c2ebacc6b
+_md5_=264264dc004d2857ae976ed3d666fcbe
diff --git a/metadata/md5-cache/kde-base/kdepimlibs-4.11.5 b/metadata/md5-cache/kde-base/kdepimlibs-4.11.5
index b45f7fe4f81c..a6783321e705 100644
--- a/metadata/md5-cache/kde-base/kdepimlibs-4.11.5
+++ b/metadata/md5-cache/kde-base/kdepimlibs-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Common library for KDE PIM apps.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug ldap prison test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!kde-misc/akonadi-social-utils >=kde-base/nepomuk-core-4.11.5:4[aqua=] >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop] >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.10.1 >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.43 dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon x11-misc/shared-mime-info prison? ( media-libs/prison ) ldap? ( net-nds/openldap ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepimlibs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=797cc7d7f059728c1666f4dcbba9502c
+_md5_=c89d512b73d7d9b810418b5a73fd2d41
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.2-r1 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.2-r1
index df42803f6773..89d453b506c0 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.2-r1
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.2:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.2:4[aqua=] >=kde-base/plasma-workspace-4.11.2:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.11.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.2:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.2:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
+DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.2:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.2:4[aqua=] >=kde-base/plasma-workspace-4.11.2:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.11.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.2:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.2:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim semantic-desktop aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.2:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.2:4[aqua=] >=kde-base/plasma-workspace-4.11.2:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.11.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.2:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.2:4[aqua=] ) >=kde-base/oxygen-icons-4.11.2:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
+RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.2:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.2:4[aqua=] >=kde-base/plasma-workspace-4.11.2:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.11.2:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.2:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.2:4[aqua=] ) >=kde-base/oxygen-icons-4.11.2:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.2:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.2/src/kdeplasma-addons-4.11.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f65b3dcfa3289395141c5ae95a4b12af
+_md5_=f199f923bdaa80ecba6db133051b33f7
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.5 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.5
index 1a8b7e579e3c..383f76bc16e6 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.11.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.11.5:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.5:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
+DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.11.5:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.5:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.11.5:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.5:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
+RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.11.5:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.11.5:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdeplasma-addons-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cdf6c45d6b643e725373a9780bcec19e
+_md5_=b1e1e1b794599a0d927b6c78b78dfee9
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.0 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.0
index aba782749201..9c236bde7c09 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.0
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.0:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.12.0:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.0:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.0:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
+DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.0:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.12.0:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.0:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.0:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim semantic-desktop aqua
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.0:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.12.0:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.0:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.0:4[aqua=] ) >=kde-base/oxygen-icons-4.12.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
+RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.0:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.12.0:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.0:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.0:4[aqua=] ) >=kde-base/oxygen-icons-4.12.0:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.0:4[aqua=]
 RESTRICT=test
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.0/src/kdeplasma-addons-4.12.0.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0a1386831d35c8a8e1f9bfd1ceb02bb5
+_md5_=955b98adce1b0370cc93d3e78f4b76c8
diff --git a/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.1 b/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.1
index 4fd048268922..ee873e55dc0b 100644
--- a/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.1
+++ b/metadata/md5-cache/kde-base/kdeplasma-addons-4.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.1:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.12.1:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.1:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.1:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
+DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.1:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.12.1:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.1:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.1:4[aqua=] ) dev-cpp/eigen:2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim semantic-desktop aqua
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
-RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.1:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-base/marble-4.12.1:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.1:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.1:4[aqua=] ) >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
+RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 >=kde-base/kdelibs-4.12.1:4[aqua=,semantic-desktop?] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=,semantic-desktop?] x11-misc/shared-mime-info attica? ( dev-libs/libattica[qt4] ) desktopglobe? ( >=kde-base/marble-4.12.1:4[aqua=] ) exif? ( >=kde-base/libkexiv2-4.12.1:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-base/kdepimlibs-4.12.1:4[aqua=] ) >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 RESTRICT=test
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kdeplasma-addons-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=321dcffb78d936663a7ed02d90c8adb3
+_md5_=021569e0b82df952480613b477762b5d
diff --git a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.11.5 b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.11.5
index 1bf157ddd175..c2a570dc3393 100644
--- a/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.11.5
+++ b/metadata/md5-cache/kde-base/kdesdk-kioslaves-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=kioslaves from kdesdk package
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug subversion aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr dev-vcs/subversion ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdesdk-kioslaves-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ac4d84377eeee975e88bf8b9b9677b4c
+_md5_=2293f2e682804cca5b32182750e1f5ca
diff --git a/metadata/md5-cache/kde-base/kdesdk-meta-4.11.5 b/metadata/md5-cache/kde-base/kdesdk-meta-4.11.5
index 4502e3641164..d6f4f86a8a6d 100644
--- a/metadata/md5-cache/kde-base/kdesdk-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdesdk-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development
 IUSE=cvs aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=cvs? ( >=kde-base/cervisia-4.11.5:4[aqua=] ) >=kde-base/dolphin-plugins-4.11.5:4[aqua=] >=kde-base/kapptemplate-4.11.5:4[aqua=] >=kde-base/kate-4.11.5:4[aqua=] >=kde-base/kcachegrind-4.11.5:4[aqua=] >=kde-base/kde-dev-scripts-4.11.5:4[aqua=] >=kde-base/kde-dev-utils-4.11.5:4[aqua=] >=kde-base/kdesdk-kioslaves-4.11.5:4[aqua=] >=kde-base/kompare-4.11.5:4[aqua=] >=kde-base/lokalize-4.11.5:4[aqua=] >=kde-base/okteta-4.11.5:4[aqua=] >=kde-base/poxml-4.11.5:4[aqua=] >=kde-base/umbrello-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=ee5bd78043bff419cdae20d3e44cbcde
+_md5_=89d5d668b55ed667a90b0582d5608968
diff --git a/metadata/md5-cache/kde-base/kdesdk-meta-4.12.1 b/metadata/md5-cache/kde-base/kdesdk-meta-4.12.1
index 80dc1ed7a9e0..6cf683a4a854 100644
--- a/metadata/md5-cache/kde-base/kdesdk-meta-4.12.1
+++ b/metadata/md5-cache/kde-base/kdesdk-meta-4.12.1
@@ -3,9 +3,9 @@ DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development
 IUSE=cvs aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=cvs? ( >=kde-base/cervisia-4.12.1:4[aqua=] ) >=kde-base/dolphin-plugins-4.12.1:4[aqua=] >=kde-base/kapptemplate-4.12.1:4[aqua=] >=kde-base/kate-4.12.1:4[aqua=] >=kde-base/kcachegrind-4.12.1:4[aqua=] >=kde-base/kde-dev-scripts-4.12.1:4[aqua=] >=kde-base/kde-dev-utils-4.12.1:4[aqua=] >=kde-base/kdesdk-kioslaves-4.12.1:4[aqua=] >=kde-base/kompare-4.12.1:4[aqua=] >=kde-base/libkomparediff2-4.12.1:4[aqua=] >=kde-base/lokalize-4.12.1:4[aqua=] >=kde-base/okteta-4.12.1:4[aqua=] >=kde-base/poxml-4.12.1:4[aqua=] >=kde-base/umbrello-4.12.1:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=001a96392b38840aad2692e0ef6994f5
+_md5_=8a587881940392bfc90e7b861f03ed60
diff --git a/metadata/md5-cache/kde-base/kdesdk-misc-4.10.5 b/metadata/md5-cache/kde-base/kdesdk-misc-4.10.5
deleted file mode 100644
index e19315b2a7bc..000000000000
--- a/metadata/md5-cache/kde-base/kdesdk-misc-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=KDE miscellaneous SDK tools
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug extras aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) !<kde-base/poxml-4.10.1:4 >=kde-base/oxygen-icons-4.10.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kdesdk-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=af5690508979f079f0b1f601658c17e1
diff --git a/metadata/md5-cache/kde-base/kdesdk-scripts-4.10.5 b/metadata/md5-cache/kde-base/kdesdk-scripts-4.10.5
deleted file mode 100644
index afd78eea19d0..000000000000
--- a/metadata/md5-cache/kde-base/kdesdk-scripts-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=KDE SDK Scripts
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug +handbook aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-base/oxygen-icons-4.10.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.10.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kdesdk-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2b02b9c6ff5361769dfef3c31a3a5420
diff --git a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.11.5 b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.11.5
index d928945fc6c5..1397dcac1643 100644
--- a/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.11.5
+++ b/metadata/md5-cache/kde-base/kdesdk-strigi-analyzer-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=kdesdk: strigi plugins
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-misc/strigi >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdesdk-strigi-analyzers-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=de0300ad6d173b8cd91c33ace00274e7
+_md5_=b83658f390a89c3b6baca04970acd8b2
diff --git a/metadata/md5-cache/kde-base/kdesu-4.11.5 b/metadata/md5-cache/kde-base/kdesu-4.11.5
index 56911bc2bf64..428419f6b3dd 100644
--- a/metadata/md5-cache/kde-base/kdesu-4.11.5
+++ b/metadata/md5-cache/kde-base/kdesu-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: gui for su(1)
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://techbase.kde.org/Projects/kdesu
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d9e09a9e52b5ca9674e4d2c607765114
+_md5_=80d69b68d8ef5ec46ec7a183d6889a91
diff --git a/metadata/md5-cache/kde-base/kdetoys-meta-4.11.5 b/metadata/md5-cache/kde-base/kdetoys-meta-4.11.5
index d232e098123c..0170bca40f96 100644
--- a/metadata/md5-cache/kde-base/kdetoys-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdetoys-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE toys - merge this to pull in all kdetoys-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://techbase.kde.org/Projects/Kdetoys
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/amor-4.11.5:4[aqua=] >=kde-base/kteatime-4.11.5:4[aqua=] >=kde-base/ktux-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=30386e84d56e271b67cf5776e56df11a
+_md5_=01e6000db369f51c99b44d489ea9bb80
diff --git a/metadata/md5-cache/kde-base/kdeutils-meta-4.11.5 b/metadata/md5-cache/kde-base/kdeutils-meta-4.11.5
index f4bc06c5c04c..1238ca29b256 100644
--- a/metadata/md5-cache/kde-base/kdeutils-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdeutils-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities http://utils.kde.org
 IUSE=cups floppy lirc aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/ark-4.11.5:4[aqua=] >=kde-base/filelight-4.11.5:4[aqua=] >=kde-base/kcalc-4.11.5:4[aqua=] >=kde-base/kcharselect-4.11.5:4[aqua=] >=kde-base/kdf-4.11.5:4[aqua=] >=kde-base/kgpg-4.11.5:4[aqua=] >=kde-base/ktimer-4.11.5:4[aqua=] >=kde-base/kwallet-4.11.5:4[aqua=] >=kde-base/superkaramba-4.11.5:4[aqua=] >=kde-base/sweeper-4.11.5:4[aqua=] cups? ( >=kde-base/print-manager-4.11.5:4[aqua=] ) floppy? ( >=kde-base/kfloppy-4.11.5:4[aqua=] ) lirc? ( >=kde-base/kremotecontrol-4.11.5:4[aqua=] )
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7450e977600a2299052386efefad3f4f
+_md5_=ee77e473107c887f54cf3bd74884eb8f
diff --git a/metadata/md5-cache/kde-base/kdewebdev-meta-4.11.5 b/metadata/md5-cache/kde-base/kdewebdev-meta-4.11.5
index a61bc8b46f60..24bec386a6b9 100644
--- a/metadata/md5-cache/kde-base/kdewebdev-meta-4.11.5
+++ b/metadata/md5-cache/kde-base/kdewebdev-meta-4.11.5
@@ -3,9 +3,9 @@ DESCRIPTION=KDE WebDev - merge this to pull in all kdewebdev-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-base/kfilereplace-4.11.5:4[aqua=] >=kde-base/kimagemapeditor-4.11.5:4[aqua=] >=kde-base/klinkstatus-4.11.5:4[aqua=] >=kde-base/kommander-4.11.5:4[aqua=]
 SLOT=4
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta-pkg	482dcd4208167a7ae152811723be4eed	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e9db9acb33268f1e7a09d966983a0536
+_md5_=5a4e8b8031cebd69be1f5e8aa3284b71
diff --git a/metadata/md5-cache/kde-base/kdf-4.11.5 b/metadata/md5-cache/kde-base/kdf-4.11.5
index dd30fab30fca..17e48ff4578a 100644
--- a/metadata/md5-cache/kde-base/kdf-4.11.5
+++ b/metadata/md5-cache/kde-base/kdf-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE free disk space utility
 EAPI=5
 HOMEPAGE=http://utils.kde.org/projects/kdf
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdf-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7d22a56ab4e8bdb8ea1c1201382e4ee1
+_md5_=7b974bc8bb11274005eb383036138409
diff --git a/metadata/md5-cache/kde-base/kdialog-4.11.5 b/metadata/md5-cache/kde-base/kdialog-4.11.5
index b9f59c254dc8..2598393150e8 100644
--- a/metadata/md5-cache/kde-base/kdialog-4.11.5
+++ b/metadata/md5-cache/kde-base/kdialog-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDialog can be used to show nice dialog boxes from shell scripts
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f74646996bf6c8b1abfe58b270938888
+_md5_=eefdd36f7fd3c1dea0d0a3bbdcb0bd14
diff --git a/metadata/md5-cache/kde-base/kdiamond-4.11.5 b/metadata/md5-cache/kde-base/kdiamond-4.11.5
index 1980640f9d32..816ee13402da 100644
--- a/metadata/md5-cache/kde-base/kdiamond-4.11.5
+++ b/metadata/md5-cache/kde-base/kdiamond-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: KDiamond is a three-in-a-row game.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kdiamond/ http://games.kde.org/game.php?game=kdiamond
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdiamond-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2ccae5fcd2d669fa4fa3467f50465d2c
+_md5_=0c35ca435cb72f8555dc50e26056ec7b
diff --git a/metadata/md5-cache/kde-base/kdm-4.11.5 b/metadata/md5-cache/kde-base/kdm-4.11.5
index 57273d790f60..4c60e3d6116c 100644
--- a/metadata/md5-cache/kde-base/kdm-4.11.5
+++ b/metadata/md5-cache/kde-base/kdm-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE login manager, similar to xdm and gdm
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +consolekit kerberos pam systemd +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.11.5:4[aqua=] media-libs/qimageblitz x11-libs/libX11 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.11.5:4[aqua=] virtual/pam ) systemd? ( sys-apps/systemd ) >=kde-base/kdepasswd-4.11.5:4[aqua=] >=x11-apps/xinit-1.0.5-r2 x11-apps/xmessage >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=consolekit? ( !systemd ) systemd? ( !consolekit )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3f159afbd1b4df81c361f6f207777871
+_md5_=b60ee31ea158cae65230321ae7561d1b
diff --git a/metadata/md5-cache/kde-base/kdnssd-4.11.5 b/metadata/md5-cache/kde-base/kdnssd-4.11.5
index 94a4ea85defe..1774ba2c5078 100644
--- a/metadata/md5-cache/kde-base/kdnssd-4.11.5
+++ b/metadata/md5-cache/kde-base/kdnssd-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kde
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug zeroconf aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=zeroconf? ( >=kde-base/kdelibs-4.11.5:4[aqua=,zeroconf] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdnssd-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=16fc4bbf359b93cb9ce98f386c371677
+_md5_=e314a1da23fdc63934a3737eacce244b
diff --git a/metadata/md5-cache/kde-base/kdontchangethehostname-4.11.5 b/metadata/md5-cache/kde-base/kdontchangethehostname-4.11.5
index c78848345859..f99236dd9f30 100644
--- a/metadata/md5-cache/kde-base/kdontchangethehostname-4.11.5
+++ b/metadata/md5-cache/kde-base/kdontchangethehostname-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to inform KDE about a change in hostname
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-apps/xauth >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4521b6c8122d2118e81ebc76360a7dec
+_md5_=2981bc96b46e838e1653121c2f1f0f87
diff --git a/metadata/md5-cache/kde-base/keditbookmarks-4.11.5 b/metadata/md5-cache/kde-base/keditbookmarks-4.11.5
index 5b2539fca845..37ea02c2dd13 100644
--- a/metadata/md5-cache/kde-base/keditbookmarks-4.11.5
+++ b/metadata/md5-cache/kde-base/keditbookmarks-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE's bookmarks editor
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=806c654286db2844d5c244588c79f4f5
+_md5_=2fd06dca31196052022e38faecaec6e5
diff --git a/metadata/md5-cache/kde-base/keditfiletype-4.11.5 b/metadata/md5-cache/kde-base/keditfiletype-4.11.5
index ac326ec6aca5..395807bfdd03 100644
--- a/metadata/md5-cache/kde-base/keditfiletype-4.11.5
+++ b/metadata/md5-cache/kde-base/keditfiletype-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE mime/file type assocciation editor
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=81d4c7adcb1183b58b216d40351a9fe6
+_md5_=f520c8f6218da6103d22c5346e2e7f1d
diff --git a/metadata/md5-cache/kde-base/kephal-4.11.5 b/metadata/md5-cache/kde-base/kephal-4.11.5
index 165dbc6a4b92..ef5afe8751fd 100644
--- a/metadata/md5-cache/kde-base/kephal-4.11.5
+++ b/metadata/md5-cache/kde-base/kephal-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Allows handling of multihead systems via the XRandR extension
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e9602cb64214c82f7fdc0d3a0e0de54c
+_md5_=a8d1d8b65f450d367544dd32fbf408ff
diff --git a/metadata/md5-cache/kde-base/kfile-4.11.5 b/metadata/md5-cache/kde-base/kfile-4.11.5
index cfda99e906b2..d8f46bb26204 100644
--- a/metadata/md5-cache/kde-base/kfile-4.11.5
+++ b/metadata/md5-cache/kde-base/kfile-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A commandline frontend to KFileMetaInfo
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0e6f57f85ff614436fa9493ef1b1ba10
+_md5_=0af435225bece213741fa894be9dab68
diff --git a/metadata/md5-cache/kde-base/kfilereplace-4.11.5 b/metadata/md5-cache/kde-base/kfilereplace-4.11.5
index f051ea5c6b97..5d6948d2068c 100644
--- a/metadata/md5-cache/kde-base/kfilereplace-4.11.5
+++ b/metadata/md5-cache/kde-base/kfilereplace-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE web development - powerful search and replace in multiple files
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kfilereplace/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdewebdev-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0dd5376c734bd552dce74865dcc2bda5
+_md5_=263f5c714ff0fda19e176611a98eb840
diff --git a/metadata/md5-cache/kde-base/kfind-4.11.5 b/metadata/md5-cache/kde-base/kfind-4.11.5
index ed7f4b548773..98050b593c56 100644
--- a/metadata/md5-cache/kde-base/kfind-4.11.5
+++ b/metadata/md5-cache/kde-base/kfind-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE file finder utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kfind/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1296a18120455a23209f7170796e9572
+_md5_=cb52a780bd95c565a2215e38be8b0b3b
diff --git a/metadata/md5-cache/kde-base/kfloppy-4.11.5 b/metadata/md5-cache/kde-base/kfloppy-4.11.5
index ce692582c479..41070cfe09bb 100644
--- a/metadata/md5-cache/kde-base/kfloppy-4.11.5
+++ b/metadata/md5-cache/kde-base/kfloppy-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KFloppy - formats disks and puts a DOS or ext2fs filesystem on them.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kfloppy/ http://utils.kde.org/projects/kfloppy/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kfloppy-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a3c2f4bdfdb2c4f425005eb126601f12
+_md5_=eab3723483ab94900e3335c3e37638b8
diff --git a/metadata/md5-cache/kde-base/kfmclient-4.11.5 b/metadata/md5-cache/kde-base/kfmclient-4.11.5
index cbe5b89bacb7..da7f08a21807 100644
--- a/metadata/md5-cache/kde-base/kfmclient-4.11.5
+++ b/metadata/md5-cache/kde-base/kfmclient-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE tool for opening URLs from the command line
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5f6718a43e95147de34414c904f8be14
+_md5_=c98ed4078ec4843f4d99fb703b6d6a1c
diff --git a/metadata/md5-cache/kde-base/kfourinline-4.11.5 b/metadata/md5-cache/kde-base/kfourinline-4.11.5
index 911892264984..79484307f9ae 100644
--- a/metadata/md5-cache/kde-base/kfourinline-4.11.5
+++ b/metadata/md5-cache/kde-base/kfourinline-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE four-in-a-row game.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kfourinline/ http://games.kde.org/game.php?game=kfourinline
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kfourinline-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8de97dfb4dc6dd105149d9a34160b4c8
+_md5_=9d6e66940233590edfe51c04054a952e
diff --git a/metadata/md5-cache/kde-base/kgamma-4.11.5 b/metadata/md5-cache/kde-base/kgamma-4.11.5
index 91943f71cb3c..f8495dfbdec1 100644
--- a/metadata/md5-cache/kde-base/kgamma-4.11.5
+++ b/metadata/md5-cache/kde-base/kgamma-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE screen gamma values kcontrol module
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXxf86vm >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kgamma-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b76d7c1e23b20915e487170fe5b7f235
+_md5_=9276acdd975c753d191a37574932bb65
diff --git a/metadata/md5-cache/kde-base/kgeography-4.11.5 b/metadata/md5-cache/kde-base/kgeography-4.11.5
index 700de2ec6f73..28da84245212 100644
--- a/metadata/md5-cache/kde-base/kgeography-4.11.5
+++ b/metadata/md5-cache/kde-base/kgeography-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: a geography learning tool
 EAPI=5
 HOMEPAGE=http://edu.kde.org/applications/miscellaneous/kgeography http://edu.kde.org/applications/all/kgeography
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kgeography-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=333dda93ed4934d64d2ebe0e48bc0286
+_md5_=6b356b884ebab43415d3f675cf1667d4
diff --git a/metadata/md5-cache/kde-base/kget-4.11.5 b/metadata/md5-cache/kde-base/kget-4.11.5
index d04618918b12..cc041a0c3c55 100644
--- a/metadata/md5-cache/kde-base/kget-4.11.5
+++ b/metadata/md5-cache/kde-base/kget-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=An advanced download manager for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/kget/
 IUSE=debug bittorrent mms semantic-desktop sqlite webkit +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] bittorrent? ( >=net-libs/libktorrent-1.0.3 ) mms? ( media-libs/libmms ) semantic-desktop? ( dev-libs/shared-desktop-ontologies dev-libs/soprano >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/nepomuk-core-4.11.5:4[aqua=] >=kde-base/nepomuk-widgets-4.11.5:4[aqua=] ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kget-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e8a59ab413047d04c7a5c2fa4316c866
+_md5_=975eb43bf5bb5846a0e88871eb5995ac
diff --git a/metadata/md5-cache/kde-base/kglobalaccel-4.11.5 b/metadata/md5-cache/kde-base/kglobalaccel-4.11.5
index 2a9f683dc921..b23d4cff852c 100644
--- a/metadata/md5-cache/kde-base/kglobalaccel-4.11.5
+++ b/metadata/md5-cache/kde-base/kglobalaccel-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE's Global Shortcut Daemon
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7f0a9cc2876d6f7354b187b01bc4d1c0
+_md5_=571a95f8838cf350433e59b2fd62964a
diff --git a/metadata/md5-cache/kde-base/kgoldrunner-4.11.5 b/metadata/md5-cache/kde-base/kgoldrunner-4.11.5
index 9b3853a06371..fd6d45769498 100644
--- a/metadata/md5-cache/kde-base/kgoldrunner-4.11.5
+++ b/metadata/md5-cache/kde-base/kgoldrunner-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: KGoldrunner is a game of action and puzzle solving
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kgoldrunner/ http://games.kde.org/game.php?game=kgoldrunner
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] media-libs/libsndfile media-libs/openal >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kgoldrunner-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=183945c52ba7bf1f0e0259a386122c0e
+_md5_=bf342d30a1ca3afcc8209d5bde140b4e
diff --git a/metadata/md5-cache/kde-base/kgpg-4.11.5 b/metadata/md5-cache/kde-base/kgpg-4.11.5
index 3bec6e7b403b..23c438bd8899 100644
--- a/metadata/md5-cache/kde-base/kgpg-4.11.5
+++ b/metadata/md5-cache/kde-base/kgpg-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE gpg keyring manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kgpg http://utils.kde.org/projects/kgpg
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-gpg )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kgpg-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4cd971676be67712ae0bf9c59886207c
+_md5_=279ccf1650de764ff1328a2960b0d359
diff --git a/metadata/md5-cache/kde-base/khangman-4.11.5 b/metadata/md5-cache/kde-base/khangman-4.11.5
index 2ae47982f575..aa2c2828eb5a 100644
--- a/metadata/md5-cache/kde-base/khangman-4.11.5
+++ b/metadata/md5-cache/kde-base/khangman-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Classical hangman game for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/khangman http://edu.kde.org/khangman
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/khangman-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=05614b84ccb72359cb434af04ff00bf4
+_md5_=d520db556541237aec2b218ccddb6fa5
diff --git a/metadata/md5-cache/kde-base/khelpcenter-4.11.5 b/metadata/md5-cache/kde-base/khelpcenter-4.11.5
index 496c8997bf0f..41031f5c542f 100644
--- a/metadata/md5-cache/kde-base/khelpcenter-4.11.5
+++ b/metadata/md5-cache/kde-base/khelpcenter-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KHelpCenter
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdesu-4.11.5:4[aqua=] >=www-misc/htdig-3.2.0_beta6-r1 >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8010bc799e5ad5055793ee5c21adf73a
+_md5_=5735e9ef43cbf169f0c911207611c594
diff --git a/metadata/md5-cache/kde-base/khotkeys-4.11.5 b/metadata/md5-cache/kde-base/khotkeys-4.11.5
index 6f43260c8e2c..3ab476912126 100644
--- a/metadata/md5-cache/kde-base/khotkeys-4.11.5
+++ b/metadata/md5-cache/kde-base/khotkeys-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: hotkey daemon
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.11.5:4[aqua=] x11-libs/libX11 x11-libs/libXtst >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=38912c58634f487529f9510dae087c2f
+_md5_=4180456f718ccedcc7809629caaa0ab5
diff --git a/metadata/md5-cache/kde-base/kiconfinder-4.11.5 b/metadata/md5-cache/kde-base/kiconfinder-4.11.5
index 338be9cfdc1a..d10c28851c38 100644
--- a/metadata/md5-cache/kde-base/kiconfinder-4.11.5
+++ b/metadata/md5-cache/kde-base/kiconfinder-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Finds an icon based on its name
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f97dea64785689074c2f316da72ee74e
+_md5_=09de6c039d9b14216254b25e3acce839
diff --git a/metadata/md5-cache/kde-base/kig-4.11.5 b/metadata/md5-cache/kde-base/kig-4.11.5
index 6e449f64b0f3..ae83dc3297b9 100644
--- a/metadata/md5-cache/kde-base/kig-4.11.5
+++ b/metadata/md5-cache/kde-base/kig-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Interactive Geometry tool
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kig http://edu.kde.org/kig
 IUSE=debug scripting python_targets_python2_7 python_single_target_python2_7 +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kig-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=40e21e2a51b70daa4e5b08dd92ab3be5
+_md5_=bc8a73a67f545542ba42ed091c2b771b
diff --git a/metadata/md5-cache/kde-base/kigo-4.11.5 b/metadata/md5-cache/kde-base/kigo-4.11.5
index 38154518dce1..f2dd00f72cfe 100644
--- a/metadata/md5-cache/kde-base/kigo-4.11.5
+++ b/metadata/md5-cache/kde-base/kigo-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Go game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kigo/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] games-board/gnugo >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kigo-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c14f3cf07f4e93eb340c82898b287540
+_md5_=316a5baf0c13d01360f379070f3d5da4
diff --git a/metadata/md5-cache/kde-base/killbots-4.11.5 b/metadata/md5-cache/kde-base/killbots-4.11.5
index 995741011852..24ea37582af4 100644
--- a/metadata/md5-cache/kde-base/killbots-4.11.5
+++ b/metadata/md5-cache/kde-base/killbots-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Kill the bots or they kill you!
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/killbots/
 IUSE=debug test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/killbots-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b63c4beaeacfbd24c47e569227f397ac
+_md5_=773a4900af3479859444474401d65fb3
diff --git a/metadata/md5-cache/kde-base/kimagemapeditor-4.11.5 b/metadata/md5-cache/kde-base/kimagemapeditor-4.11.5
index 1f395871f111..8d296bf3e969 100644
--- a/metadata/md5-cache/kde-base/kimagemapeditor-4.11.5
+++ b/metadata/md5-cache/kde-base/kimagemapeditor-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE web development - image map editor
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kimagemapeditor/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdewebdev-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=732b4ba6707c9d90d8a0cdc96f072fec
+_md5_=5c82b35ccd4cddd4ebeccb2b93abe086
diff --git a/metadata/md5-cache/kde-base/kimgio-4.11.5 b/metadata/md5-cache/kde-base/kimgio-4.11.5
index 330e0611db14..a523e86aceda 100644
--- a/metadata/md5-cache/kde-base/kimgio-4.11.5
+++ b/metadata/md5-cache/kde-base/kimgio-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE WebP image format plugin
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libwebp:= >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a328715f15da49aa57280562ad77b726
+_md5_=04140a67baa2ad412059ff6fbc7d34ad
diff --git a/metadata/md5-cache/kde-base/kimono-4.11.5 b/metadata/md5-cache/kde-base/kimono-4.11.5
index df96098fc2d4..cf231c77db80 100644
--- a/metadata/md5-cache/kde-base/kimono-4.11.5
+++ b/metadata/md5-cache/kde-base/kimono-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=C# bindings for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=akonadi debug plasma semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/qyoto-4.11.5:4[aqua=,webkit] >=kde-base/smokeqt-4.11.5:4[aqua=] >=kde-base/smokekde-4.11.5:4[aqua=,semantic-desktop?] plasma? ( >=kde-base/smokeqt-4.11.5:4[aqua=,webkit] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kimono-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=947b3a8caf21d54088bca13feda42d93
+_md5_=0cddace6d7f113c5a5c7713f97a0e0ef
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.11.5 b/metadata/md5-cache/kde-base/kinfocenter-4.11.5
index 6e0ba24a8d4e..dc761a5f86a4 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.11.5
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Info Center
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/kinfocenter/
 IUSE=debug ieee1394 opengl +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=368f9cbd4fa7da6c85bc42f885e6b213
+_md5_=b065756f700ec87dba3b23ae8b7d477f
diff --git a/metadata/md5-cache/kde-base/kioclient-4.11.5 b/metadata/md5-cache/kde-base/kioclient-4.11.5
index 691b59cf3684..941252677fc6 100644
--- a/metadata/md5-cache/kde-base/kioclient-4.11.5
+++ b/metadata/md5-cache/kde-base/kioclient-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tool for network-transparent operations
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=79b3ccc5e00fe7e009914ddbc3a663a6
+_md5_=eca6b7a96d30b54602bbbeed4b8be369
diff --git a/metadata/md5-cache/kde-base/kiriki-4.11.5 b/metadata/md5-cache/kde-base/kiriki-4.11.5
index 8df3ae738760..b3d484d5ddc5 100644
--- a/metadata/md5-cache/kde-base/kiriki-4.11.5
+++ b/metadata/md5-cache/kde-base/kiriki-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Kiriki - a gtali clone for KDE4
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kiriki/ http://games.kde.org/game.php?game=kiriki
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kiriki-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c0cfeddb3511f5e186d11f90b04d861b
+_md5_=b68ed1ba928424452d929321f1f48298
diff --git a/metadata/md5-cache/kde-base/kiten-4.11.5 b/metadata/md5-cache/kde-base/kiten-4.11.5
index ebb355775805..ce29ada88133 100644
--- a/metadata/md5-cache/kde-base/kiten-4.11.5
+++ b/metadata/md5-cache/kde-base/kiten-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Japanese dictionary and reference
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kiten http://edu.kde.org/kiten
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kiten-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b31be792af1ce70d73e90bbd8c44ef79
+_md5_=603ebae7459eaa526cbb9bd616466e6d
diff --git a/metadata/md5-cache/kde-base/kjots-4.11.5 b/metadata/md5-cache/kde-base/kjots-4.11.5
index 1613b6258e12..ab2d8e1c18ad 100644
--- a/metadata/md5-cache/kde-base/kjots-4.11.5
+++ b/metadata/md5-cache/kde-base/kjots-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE note taking utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kjots/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/grantlee-0.2.0 >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=16b00f5aabf7db32aae2c08659be0931
+_md5_=5d4bcdbf395cbfe7cfa0c9e478d790ae
diff --git a/metadata/md5-cache/kde-base/kjumpingcube-4.11.5 b/metadata/md5-cache/kde-base/kjumpingcube-4.11.5
index a85fce473ee3..279e9c815393 100644
--- a/metadata/md5-cache/kde-base/kjumpingcube-4.11.5
+++ b/metadata/md5-cache/kde-base/kjumpingcube-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Tactical one or two player game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kjumpingcube/ http://games.kde.org/game.php?game=kjumpingcube
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kjumpingcube-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5e981d498fa95f1f4eceb8aceaa346dc
+_md5_=fa3a30c54e14e85609f855bd44018d83
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.11.5 b/metadata/md5-cache/kde-base/kleopatra-4.11.5
index 6f62e74fb1c8..728fad1e974c 100644
--- a/metadata/md5-cache/kde-base/kleopatra-4.11.5
+++ b/metadata/md5-cache/kde-base/kleopatra-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Kleopatra - KDE X.509 key manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kleopatra/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.3.2 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] app-crypt/gnupg >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a8f1012bd259770ece60fb749656487f
+_md5_=7002d7efef1803ff09d5e46768703089
diff --git a/metadata/md5-cache/kde-base/klettres-4.11.5 b/metadata/md5-cache/kde-base/klettres-4.11.5
index a2720a5dc044..1332d71297a3 100644
--- a/metadata/md5-cache/kde-base/klettres-4.11.5
+++ b/metadata/md5-cache/kde-base/klettres-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: KLettres helps a very young child or an adult learning
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/klettres http://edu.kde.org/klettres
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/klettres-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=59668641c899c8e24c6c7007e6b559b9
+_md5_=05b515654106e92240704ffbae8332f5
diff --git a/metadata/md5-cache/kde-base/klickety-4.11.5 b/metadata/md5-cache/kde-base/klickety-4.11.5
index 88a30afddb70..e7210dcbd203 100644
--- a/metadata/md5-cache/kde-base/klickety-4.11.5
+++ b/metadata/md5-cache/kde-base/klickety-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A KDE game almost the same as ksame, but a bit different.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/klickety-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=64b2d77f050ffcea780cef258225f053
+_md5_=365ff3e57bb869dc6745984450313c1a
diff --git a/metadata/md5-cache/kde-base/klines-4.11.5 b/metadata/md5-cache/kde-base/klines-4.11.5
index cfcad652ce83..6638d1438e6f 100644
--- a/metadata/md5-cache/kde-base/klines-4.11.5
+++ b/metadata/md5-cache/kde-base/klines-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Kolor Lines - a little game about balls and how to get rid of t
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/klines/ http://games.kde.org/game.php?game=klines
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/klines-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1f9009b22db4be6c89c1d7a61b863b31
+_md5_=1e7d3f09b6ec561e381c6c0cdba4b716
diff --git a/metadata/md5-cache/kde-base/klinkstatus-4.11.5 b/metadata/md5-cache/kde-base/klinkstatus-4.11.5
index 9cc42b489787..ab6a23682285 100644
--- a/metadata/md5-cache/kde-base/klinkstatus-4.11.5
+++ b/metadata/md5-cache/kde-base/klinkstatus-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE web development - link validity checker
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/klinkstatus/
 IUSE=debug tidy +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] tidy? ( app-text/htmltidy ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdewebdev-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0e41fdcad24d53ef54223763e40b7a31
+_md5_=4a16c3b581d9df3c4374eb4657bef91b
diff --git a/metadata/md5-cache/kde-base/klipper-4.11.5 b/metadata/md5-cache/kde-base/klipper-4.11.5
index 388a46087325..3d465bd027e0 100644
--- a/metadata/md5-cache/kde-base/klipper-4.11.5
+++ b/metadata/md5-cache/kde-base/klipper-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Applet for KDE and X clipboard management
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/Klipper
 IUSE=debug prison +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/libtaskmanager-4.11.5:4[aqua=] sys-libs/zlib x11-libs/libX11 prison? ( media-libs/prison ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f18e55dba1f6b4b6bc4374ac25461f76
+_md5_=0341c459a6384620d61bdc5432f8d880
diff --git a/metadata/md5-cache/kde-base/kmag-4.11.5 b/metadata/md5-cache/kde-base/kmag-4.11.5
index ac1c047875a7..a70bea2d9a18 100644
--- a/metadata/md5-cache/kde-base/kmag-4.11.5
+++ b/metadata/md5-cache/kde-base/kmag-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE screen magnifier
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kmag/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kaccessible-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmag-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e0dc97dd0fbb1c606bc1946e5b5f5e1e
+_md5_=a189d9eb484189d2143ff1ec0832a514
diff --git a/metadata/md5-cache/kde-base/kmahjongg-4.11.5 b/metadata/md5-cache/kde-base/kmahjongg-4.11.5
index e27da9e64501..3ee7539e24df 100644
--- a/metadata/md5-cache/kde-base/kmahjongg-4.11.5
+++ b/metadata/md5-cache/kde-base/kmahjongg-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Mahjongg for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kmahjongg/ http://games.kde.org/game.php?game=kmahjongg
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/libkmahjongg-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmahjongg-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=370253feaaaf790c5496e4a0d27c1ea9
+_md5_=85298527a8683bb0b0ae4889843cc96d
diff --git a/metadata/md5-cache/kde-base/kmail-4.11.5 b/metadata/md5-cache/kde-base/kmail-4.11.5
index 5695d47bc767..2610dd353720 100644
--- a/metadata/md5-cache/kde-base/kmail-4.11.5
+++ b/metadata/md5-cache/kde-base/kmail-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KMail is the email component of Kontact, the integrated personal inf
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/kmail/
 IUSE=debug test +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/korganizer-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f22808a8292f72c0599a7d884f14c29c
+_md5_=e6874e432de7196bb7f2fdedf341b51f
diff --git a/metadata/md5-cache/kde-base/kmenuedit-4.11.5 b/metadata/md5-cache/kde-base/kmenuedit-4.11.5
index 39ba0855384e..d66c5cd6f098 100644
--- a/metadata/md5-cache/kde-base/kmenuedit-4.11.5
+++ b/metadata/md5-cache/kde-base/kmenuedit-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/khotkeys-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=19cbef931df1974dbb9d0f2bc46144ac
+_md5_=1a5d02b38372175614240206bbee2905
diff --git a/metadata/md5-cache/kde-base/kmimetypefinder-4.11.5 b/metadata/md5-cache/kde-base/kmimetypefinder-4.11.5
index 5e99432da385..96d5d5f07a31 100644
--- a/metadata/md5-cache/kde-base/kmimetypefinder-4.11.5
+++ b/metadata/md5-cache/kde-base/kmimetypefinder-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE application to report the mimetype for a given file
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a05063ae771a8004c96d1be2e4e45bb7
+_md5_=4a96ef5c07a2d48edfadb9d58cf966b7
diff --git a/metadata/md5-cache/kde-base/kmines-4.11.5 b/metadata/md5-cache/kde-base/kmines-4.11.5
index 0fe034ae3db3..e7e96fbef770 100644
--- a/metadata/md5-cache/kde-base/kmines-4.11.5
+++ b/metadata/md5-cache/kde-base/kmines-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KMines is a classic mine sweeper game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kmines/ http://games.kde.org/game.php?game=kmines
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmines-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9e4ccd49a4f53d19e315509658ccb10e
+_md5_=61f3e9d6aef03eeff0485aef9e5c7824
diff --git a/metadata/md5-cache/kde-base/kmix-4.11.5 b/metadata/md5-cache/kde-base/kmix-4.11.5
index 44687ff26f48..b4a7644ccc02 100644
--- a/metadata/md5-cache/kde-base/kmix-4.11.5
+++ b/metadata/md5-cache/kde-base/kmix-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE mixer gui
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/multimedia/kmix/
 IUSE=alsa debug canberra pulseaudio +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.14a ) canberra? ( media-libs/libcanberra ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmix-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a26a1aec1f683a63f75ed3e29bf86e1e
+_md5_=03b555262664413bc83d30d4c263caed
diff --git a/metadata/md5-cache/kde-base/kmousetool-4.11.5 b/metadata/md5-cache/kde-base/kmousetool-4.11.5
index 302541112d26..0a2de3b62f0d 100644
--- a/metadata/md5-cache/kde-base/kmousetool-4.11.5
+++ b/metadata/md5-cache/kde-base/kmousetool-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE program that clicks the mouse for you.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kmousetool/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmousetool-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bc634fb2f7443620be924d90a13ca3aa
+_md5_=be11900b3efcdd323868bc4a385333e9
diff --git a/metadata/md5-cache/kde-base/kmouth-4.11.5 b/metadata/md5-cache/kde-base/kmouth-4.11.5
index e15be6164623..a5c2b1b74793 100644
--- a/metadata/md5-cache/kde-base/kmouth-4.11.5
+++ b/metadata/md5-cache/kde-base/kmouth-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE application that reads what you type out loud. Doesn't include a
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kmouth/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmouth-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ca4e25cc09f9f7dceddae04b4d5f85fb
+_md5_=b6258dc5ea1c3cf8dff53aad85946ecd
diff --git a/metadata/md5-cache/kde-base/kmplot-4.11.5 b/metadata/md5-cache/kde-base/kmplot-4.11.5
index c5ee5c1770c2..8a35e7fad4f1 100644
--- a/metadata/md5-cache/kde-base/kmplot-4.11.5
+++ b/metadata/md5-cache/kde-base/kmplot-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Mathematical function plotter for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kmplot http://edu.kde.org/kmplot
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kmplot-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=32b8dab85575657de983d7d76c1515d4
+_md5_=03d0814aadeb06c02992ed18e5e4a505
diff --git a/metadata/md5-cache/kde-base/knavalbattle-4.11.5 b/metadata/md5-cache/kde-base/knavalbattle-4.11.5
index 3fcbaec6aeaf..3f264c022e8b 100644
--- a/metadata/md5-cache/kde-base/knavalbattle-4.11.5
+++ b/metadata/md5-cache/kde-base/knavalbattle-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE Battleship clone
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/navalbattle/ http://games.kde.org/game.php?game=kbattleship
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] !kde-base/kbattleship:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/knavalbattle-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8acd77813ee1f9ba58ae8858826caba9
+_md5_=bd080d130c82481efc46fbe9fce79249
diff --git a/metadata/md5-cache/kde-base/knetattach-4.11.5 b/metadata/md5-cache/kde-base/knetattach-4.11.5
index ba88f3c8f53c..28aed7996d15 100644
--- a/metadata/md5-cache/kde-base/knetattach-4.11.5
+++ b/metadata/md5-cache/kde-base/knetattach-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE network wizard
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7f5b6e02248960de30d9a28d29d14cff
+_md5_=af947e3be71b2c2711d62ee2285c3087
diff --git a/metadata/md5-cache/kde-base/knetwalk-4.11.5 b/metadata/md5-cache/kde-base/knetwalk-4.11.5
index e3ed6010bbf4..c2353a3dd1e2 100644
--- a/metadata/md5-cache/kde-base/knetwalk-4.11.5
+++ b/metadata/md5-cache/kde-base/knetwalk-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Knetwalk is the kde version of the popular NetWalk game for sys
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/knetwalk/ http://games.kde.org/game.php?game=knetwalk
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/knetwalk-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6a1e0182758799037dac31792ce363dc
+_md5_=ad52a1bf0d8b56ff80c112b5c3c079a5
diff --git a/metadata/md5-cache/kde-base/knewstuff-4.11.5 b/metadata/md5-cache/kde-base/knewstuff-4.11.5
index a2fd5be0ad0a..35ef41449124 100644
--- a/metadata/md5-cache/kde-base/knewstuff-4.11.5
+++ b/metadata/md5-cache/kde-base/knewstuff-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE4 software to download and upload 'new stuff'
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f3f6ce7fd51654a605ba4baf19f0dacf
+_md5_=e777d57467ffd46154c2e25bd19e5563
diff --git a/metadata/md5-cache/kde-base/knode-4.11.5 b/metadata/md5-cache/kde-base/knode-4.11.5
index d5d164b438c9..44b22ac8b3e5 100644
--- a/metadata/md5-cache/kde-base/knode-4.11.5
+++ b/metadata/md5-cache/kde-base/knode-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=A newsreader for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/knode/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ee8c0a29ae6024010bdff025249bb49e
+_md5_=098266448c55c385ce3168163c7effe7
diff --git a/metadata/md5-cache/kde-base/knotes-4.11.5 b/metadata/md5-cache/kde-base/knotes-4.11.5
index 4e91f1b15e31..59e4460256f4 100644
--- a/metadata/md5-cache/kde-base/knotes-4.11.5
+++ b/metadata/md5-cache/kde-base/knotes-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Notes application
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/knotes/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=185f734b991d28fc47f12f43c390b46e
+_md5_=0b77a50f2588b5a9f49c26ec51b6860a
diff --git a/metadata/md5-cache/kde-base/knotify-4.11.5 b/metadata/md5-cache/kde-base/knotify-4.11.5
index ddcfe8700ef7..741582a2b692 100644
--- a/metadata/md5-cache/kde-base/knotify-4.11.5
+++ b/metadata/md5-cache/kde-base/knotify-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE notification daemon.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=faaafa067088f64ae45ec17e33095872
+_md5_=07b003b9d7ab07e3f738459b0c8ddc29
diff --git a/metadata/md5-cache/kde-base/kolf-4.11.5 b/metadata/md5-cache/kde-base/kolf-4.11.5
index 7c4055a7bc8b..3f19ff7ef66e 100644
--- a/metadata/md5-cache/kde-base/kolf-4.11.5
+++ b/metadata/md5-cache/kde-base/kolf-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Minigolf Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kolf/ http://games.kde.org/game.php?game=kolf
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kolf-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1b3a69e4691123ac8226e87fb7f96623
+_md5_=6a481f557fec76f3adbfb8ff08f7eeba
diff --git a/metadata/md5-cache/kde-base/kollision-4.11.5 b/metadata/md5-cache/kde-base/kollision-4.11.5
index cd70ef118df7..5276c44b5511 100644
--- a/metadata/md5-cache/kde-base/kollision-4.11.5
+++ b/metadata/md5-cache/kde-base/kollision-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A simple ball dodging game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kollision/ http://games.kde.org/game.php?game=kollision
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kollision-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=36b6cae32c4cca87162a476da1b822e6
+_md5_=fade074b37e813e0ac0b3f069a81ac2a
diff --git a/metadata/md5-cache/kde-base/kolourpaint-4.11.5 b/metadata/md5-cache/kde-base/kolourpaint-4.11.5
index 8877e12c0307..5208fbde86ed 100644
--- a/metadata/md5-cache/kde-base/kolourpaint-4.11.5
+++ b/metadata/md5-cache/kde-base/kolourpaint-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Paint Program for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/kolourpaint/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 RDEPEND=media-libs/qimageblitz >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kolourpaint-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cd72d3414787da1f7fd256eb593665fa
+_md5_=9a79bd6235d1128974a7f438adb497c2
diff --git a/metadata/md5-cache/kde-base/kommander-4.11.5 b/metadata/md5-cache/kde-base/kommander-4.11.5
index 798812626bb2..c6e86eeac291 100644
--- a/metadata/md5-cache/kde-base/kommander-4.11.5
+++ b/metadata/md5-cache/kde-base/kommander-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE dialog system for scripting
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kommander/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdewebdev-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dbd5177578aeb1a86dab3724650f1116
+_md5_=e420859a2b9af5d52e93b3e2b780ba64
diff --git a/metadata/md5-cache/kde-base/kompare-4.11.5 b/metadata/md5-cache/kde-base/kompare-4.11.5
index cda1086e24f0..a17be30c498c 100644
--- a/metadata/md5-cache/kde-base/kompare-4.11.5
+++ b/metadata/md5-cache/kde-base/kompare-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Kompare is a program to view the differences between files.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kompare-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=40f795a0a1a91c53cbe5b5b460629319
+_md5_=72f748911843e8280656c0e86893353d
diff --git a/metadata/md5-cache/kde-base/kompare-4.12.1 b/metadata/md5-cache/kde-base/kompare-4.12.1
index b9d89c6139a9..ffdb6ea33dc7 100644
--- a/metadata/md5-cache/kde-base/kompare-4.12.1
+++ b/metadata/md5-cache/kde-base/kompare-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=Kompare is a program to view the differences between files.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkomparediff2-4.12.1:4[aqua=] >=kde-base/oxygen-icons-4.12.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.12.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kompare-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e24f19e07d65fcf674499d36108ec4f2
+_md5_=d1ab7d730ef1fc645639a47671013686
diff --git a/metadata/md5-cache/kde-base/konq-plugins-4.11.5 b/metadata/md5-cache/kde-base/konq-plugins-4.11.5
index 75312162ccce..9785d1e35b87 100644
--- a/metadata/md5-cache/kde-base/konq-plugins-4.11.5
+++ b/metadata/md5-cache/kde-base/konq-plugins-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Various plugins for konqueror
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug tidy aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-base/kcmshell-4.11.5:4[aqua=] >=kde-base/konqueror-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bc108fab13e7028934a15be8f84c4649
+_md5_=ba25741a6578457cf351aa282db0dcd0
diff --git a/metadata/md5-cache/kde-base/konqueror-4.11.5 b/metadata/md5-cache/kde-base/konqueror-4.11.5
index ad3b2673e438..d31878a54dff 100644
--- a/metadata/md5-cache/kde-base/konqueror-4.11.5
+++ b/metadata/md5-cache/kde-base/konqueror-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE: Web browser, file manager, ...
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/konqueror/ http://konqueror.org/
 IUSE=+bookmarks debug svg +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/kfind-4.11.5:4[aqua=] >=kde-base/kfmclient-4.11.5:4[aqua=] bookmarks? ( >=kde-base/keditbookmarks-4.11.5:4[aqua=] ) svg? ( >=kde-base/svgpart-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e3ed40a32ad5b9b23a9aec36c860db4b
+_md5_=32ceef46c38519a2d3d6a69ebcf6c9f0
diff --git a/metadata/md5-cache/kde-base/konquest-4.11.5 b/metadata/md5-cache/kde-base/konquest-4.11.5
index 2f79f127efcd..fea47843e5d7 100644
--- a/metadata/md5-cache/kde-base/konquest-4.11.5
+++ b/metadata/md5-cache/kde-base/konquest-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Galactic Strategy KDE Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/konquest/ http://games.kde.org/game.php?game=konquest
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/konquest-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bdfcc869bb4a74584aadfde4c30b7d2f
+_md5_=0d434f331b5c18731612b84ed985edb0
diff --git a/metadata/md5-cache/kde-base/konsole-4.11.5 b/metadata/md5-cache/kde-base/konsole-4.11.5
index 993b021e82fb..0f758b5072d0 100644
--- a/metadata/md5-cache/kde-base/konsole-4.11.5
+++ b/metadata/md5-cache/kde-base/konsole-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=X terminal for use with KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/konsole http://konsole.kde.org
 IUSE=debug test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!aqua? ( >=kde-base/libkonq-4.11.5:4[aqua=] x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/konsole-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4a93cff11dbf700382938c67ef787ade
+_md5_=f07cf49b7558f3c2a09561bdb35fc605
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.11.5 b/metadata/md5-cache/kde-base/konsolekalendar-4.11.5
index d82c4aedabaf..2282da2774ac 100644
--- a/metadata/md5-cache/kde-base/konsolekalendar-4.11.5
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A command line interface to KDE calendars
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KonsoleKalendar
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f958302fb7912b2cd117c3ecdfb523db
+_md5_=0ea78823c7ed0d600b3a7cccb100d57c
diff --git a/metadata/md5-cache/kde-base/kontact-4.11.5 b/metadata/md5-cache/kde-base/kontact-4.11.5
index 3d2229219db8..a72e6478c59c 100644
--- a/metadata/md5-cache/kde-base/kontact-4.11.5
+++ b/metadata/md5-cache/kde-base/kontact-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE personal information manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/kontact/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=899eb6aff9d79ae52c4f2a1e907bc446
+_md5_=2c1dc6db6bb451cd563509aff03dd1f2
diff --git a/metadata/md5-cache/kde-base/kopete-4.11.5 b/metadata/md5-cache/kde-base/kopete-4.11.5
index 4a45fef4ff16..e2537d1e2ceb 100644
--- a/metadata/md5-cache/kde-base/kopete-4.11.5
+++ b/metadata/md5-cache/kde-base/kopete-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE multi-protocol IM client
 EAPI=5
 HOMEPAGE=http://kopete.kde.org http://www.kde.org/applications/internet/kopete
 IUSE=debug ssl v4l +addbookmarks +autoreplace +contactnotes +highlight +history latex +nowlistening otr +pipes +privacy +statistics +texteffect +translator +urlpicpreview webpresence gadu groupwise jingle meanwhile msn oscar skype sms testbed winpopup +xmpp yahoo zeroconf +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=kde-base/kdepimlibs-4.11.5:4[aqua=] media-libs/qimageblitz >=dev-qt/qtgui-4.4.0:4[mng] !aqua? ( x11-libs/libXScrnSaver ) gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2 ) jingle? ( >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) msn? ( >=net-libs/libmsn-4.1 ) otr? ( >=net-libs/libotr-3.2.0 <net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2 net-dns/libidn ) yahoo? ( media-libs/jasper ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) sms? ( app-mobilephone/smssend ) ssl? ( app-crypt/qca-ossl ) winpopup? ( net-fs/samba ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kopete-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1e7ec7c6baa0d4c91f9a3bbe19003749
+_md5_=686a238b034d4809c5f092dbc4449e9a
diff --git a/metadata/md5-cache/kde-base/korganizer-4.11.5 b/metadata/md5-cache/kde-base/korganizer-4.11.5
index c48650a247bf..ac61fcf54a5c 100644
--- a/metadata/md5-cache/kde-base/korganizer-4.11.5
+++ b/metadata/md5-cache/kde-base/korganizer-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=A Personal Organizer for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/office/korganizer/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] sys-libs/zlib >=kde-base/ktimezoned-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a064b7b1c920d997bb17c5274a7d0ec
+_md5_=f53e717a05254f51ecef1882dc03a597
diff --git a/metadata/md5-cache/kde-base/korundum-4.11.5 b/metadata/md5-cache/kde-base/korundum-4.11.5
index 139d3af45a2f..6f4fc5e9a444 100644
--- a/metadata/md5-cache/kde-base/korundum-4.11.5
+++ b/metadata/md5-cache/kde-base/korundum-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Ruby bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
 IUSE=akonadi debug kate okular aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/qtruby-4.11.5:4[aqua=] >=kde-base/smokekde-4.11.5:4[aqua=,kate?,okular?,semantic-desktop] >=kde-base/smokeqt-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/korundum-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=38054e0c2bcdc13cbbb2964e6070f057
+_md5_=14ec7e1182ca14ad3fe8691fbfbaf168
diff --git a/metadata/md5-cache/kde-base/kpasswdserver-4.11.5 b/metadata/md5-cache/kde-base/kpasswdserver-4.11.5
index 32ae40690e40..72278e092301 100644
--- a/metadata/md5-cache/kde-base/kpasswdserver-4.11.5
+++ b/metadata/md5-cache/kde-base/kpasswdserver-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDED Password Module
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=92e2e2222a737a7e2cb8dd252abbef6d
+_md5_=a095338910cdee36679de7d5a0660ba9
diff --git a/metadata/md5-cache/kde-base/kpat-4.11.5 b/metadata/md5-cache/kde-base/kpat-4.11.5
index d8a89a57999b..e7c52feee292 100644
--- a/metadata/md5-cache/kde-base/kpat-4.11.5
+++ b/metadata/md5-cache/kde-base/kpat-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE patience game
 EAPI=5
 HOMEPAGE=http://games.kde.org/game.php?game=kpat
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kpat-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2c5c6f4dad1d42d2b50641d56f73bd53
+_md5_=f02603c4b42be89f1bba61aac031832e
diff --git a/metadata/md5-cache/kde-base/kppp-4.11.5 b/metadata/md5-cache/kde-base/kppp-4.11.5
index 9e088fe4ad56..65ee181c67bf 100644
--- a/metadata/md5-cache/kde-base/kppp-4.11.5
+++ b/metadata/md5-cache/kde-base/kppp-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A dialer and front-end to pppd.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/kppp
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kppp-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=724c623a16aab3b2a765631bf22dfb05
+_md5_=f7a51b17c9bd78c76d06190a6c83ff85
diff --git a/metadata/md5-cache/kde-base/kquitapp-4.11.5 b/metadata/md5-cache/kde-base/kquitapp-4.11.5
index 4eec3a5fb6e0..0235d24522fe 100644
--- a/metadata/md5-cache/kde-base/kquitapp-4.11.5
+++ b/metadata/md5-cache/kde-base/kquitapp-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A CLI application quitter
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e54a8b9eb1806650559a2a68446b4da9
+_md5_=e954bc18e3d1dafb942e96415be87c25
diff --git a/metadata/md5-cache/kde-base/krdc-4.11.5 b/metadata/md5-cache/kde-base/krdc-4.11.5
index 5e212ff813df..cc414f5e12cc 100644
--- a/metadata/md5-cache/kde-base/krdc-4.11.5
+++ b/metadata/md5-cache/kde-base/krdc-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE remote desktop connection (RDP and VNC) client
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/internet/krdc/
 IUSE=debug jpeg rdesktop vnc zeroconf telepathy +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) telepathy? ( >=net-libs/telepathy-qt-0.9 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/krdc-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=14d8c18b8a2537c660bc01fa7b822ece
+_md5_=054756f6506da1587917fccc7374507e
diff --git a/metadata/md5-cache/kde-base/kreadconfig-4.11.5 b/metadata/md5-cache/kde-base/kreadconfig-4.11.5
index b25002a41267..a3f155da29be 100644
--- a/metadata/md5-cache/kde-base/kreadconfig-4.11.5
+++ b/metadata/md5-cache/kde-base/kreadconfig-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A command-line tool to read KConfig entries
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ed9370c85f271dd27504891f013af506
+_md5_=a781ba604f43c2c86660f4c5652b4c37
diff --git a/metadata/md5-cache/kde-base/kremotecontrol-4.11.5 b/metadata/md5-cache/kde-base/kremotecontrol-4.11.5
index 746dba4dd812..30bbdac7e2ef 100644
--- a/metadata/md5-cache/kde-base/kremotecontrol-4.11.5
+++ b/metadata/md5-cache/kde-base/kremotecontrol-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE frontend for the Linux Infrared Remote Control system
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kremotecontrol http://utils.kde.org/projects/kremotecontrol
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-misc/lirc >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kremotecontrol-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d436aae79f843077733cd6253ff9c858
+_md5_=dc860f55b4ec9f55a73bf95c878fcb50
diff --git a/metadata/md5-cache/kde-base/kreversi-4.11.5 b/metadata/md5-cache/kde-base/kreversi-4.11.5
index 48504c15055f..a6ac971aac25 100644
--- a/metadata/md5-cache/kde-base/kreversi-4.11.5
+++ b/metadata/md5-cache/kde-base/kreversi-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Board Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kreversi/ http://games.kde.org/game.php?game=kreversi
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kreversi-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=98f27db214f8170e88bd93153556f0c0
+_md5_=938778a07090832609870397152e928e
diff --git a/metadata/md5-cache/kde-base/krfb-4.11.5 b/metadata/md5-cache/kde-base/krfb-4.11.5
index 537feeaa5eb5..5a38d8381c12 100644
--- a/metadata/md5-cache/kde-base/krfb-4.11.5
+++ b/metadata/md5-cache/kde-base/krfb-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=VNC-compatible server to share KDE desktops
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/krfb/
 IUSE=debug telepathy +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg:0 !aqua? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXtst ) telepathy? ( >=net-libs/telepathy-qt-0.9 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/krfb-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5bf19bf81ed79e38d3e4cc293ca3da39
+_md5_=1141d6e5fdcc5d8983797f4969e5f4f4
diff --git a/metadata/md5-cache/kde-base/krossjava-4.11.5 b/metadata/md5-cache/kde-base/krossjava-4.11.5
index 613f54bf7447..e576ea395abb 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.11.5
+++ b/metadata/md5-cache/kde-base/krossjava-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Java plugin for the kdelibs/kross scripting framework.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug elibc_FreeBSD elibc_FreeBSD aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 !!dev-java/ibm-jdk-bin >=dev-java/java-config-2.1.9-r1 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kross-interpreters-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f0502dd33557444dad4f583295741517
+_md5_=4c52b64df7f62fdc1f4f86057f9ad88d
diff --git a/metadata/md5-cache/kde-base/krosspython-4.11.5 b/metadata/md5-cache/kde-base/krosspython-4.11.5
index 66aa041d8f1f..4fa38a88b6a6 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.11.5
+++ b/metadata/md5-cache/kde-base/krosspython-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Kross scripting framework: Python interpreter
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kross-interpreters-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e8666de427c0dd9c917bd4ed5f487927
+_md5_=60c50ce3fa0851bc87c154c0da06de11
diff --git a/metadata/md5-cache/kde-base/krossruby-4.11.5 b/metadata/md5-cache/kde-base/krossruby-4.11.5
index c98ebab86b08..f7d382f6d80e 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.11.5
+++ b/metadata/md5-cache/kde-base/krossruby-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Kross scripting framework: Ruby interpreter
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kross-interpreters-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c7fa8d0d5778982c1044173e00589cb1
+_md5_=ee7183c400c9155e2f523da5f1c839f4
diff --git a/metadata/md5-cache/kde-base/kruler-4.11.5 b/metadata/md5-cache/kde-base/kruler-4.11.5
index 890a1300818e..f217092375c5 100644
--- a/metadata/md5-cache/kde-base/kruler-4.11.5
+++ b/metadata/md5-cache/kde-base/kruler-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A screen ruler for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/kruler/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kruler-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=afc4ba55d1b5be039e83d7eb0bb679ee
+_md5_=187ad7d5d75bb6a5765493d9c385a8fb
diff --git a/metadata/md5-cache/kde-base/krunner-4.11.5 b/metadata/md5-cache/kde-base/krunner-4.11.5
index e43ba1620fa7..366f80ae1c1b 100644
--- a/metadata/md5-cache/kde-base/krunner-4.11.5
+++ b/metadata/md5-cache/kde-base/krunner-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Command Runner
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/Plasma/Krunner
 IUSE=debug opengl aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kcheckpass-4.11.5:4[aqua=] >=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/ksmserver-4.11.5:4[aqua=] >=kde-base/ksysguard-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/libplasmagenericshell-4.11.5:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3add20f6baa050fc8d504e05e19fdffb
+_md5_=9b43dfd9dde774957e08399ebd25bf66
diff --git a/metadata/md5-cache/kde-base/ksaneplugin-4.11.5 b/metadata/md5-cache/kde-base/ksaneplugin-4.11.5
index 59de04afbf39..b08fd5e95b66 100644
--- a/metadata/md5-cache/kde-base/ksaneplugin-4.11.5
+++ b/metadata/md5-cache/kde-base/ksaneplugin-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=SANE Plugin for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libksane-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksaneplugin-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5af3f45423b882d47e7b7fa748532f3f
+_md5_=8c824e4ba8705ffc786c0bf8549879ed
diff --git a/metadata/md5-cache/kde-base/kscd-4.11.5 b/metadata/md5-cache/kde-base/kscd-4.11.5
index 8204a8884ccb..00b27e70ab35 100644
--- a/metadata/md5-cache/kde-base/kscd-4.11.5
+++ b/metadata/md5-cache/kde-base/kscd-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE CD player
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/multimedia/kscd/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkcddb-4.11.5:4[aqua=] >=kde-base/libkcompactdisc-4.11.5:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kscd-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cc704bbcea68eb16baa9fb550a72544c
+_md5_=c10074485e2a67ec283c97945fc94c45
diff --git a/metadata/md5-cache/kde-base/kscreensaver-4.11.5 b/metadata/md5-cache/kde-base/kscreensaver-4.11.5
index f3a740c1a49a..702e67ec8dc0 100644
--- a/metadata/md5-cache/kde-base/kscreensaver-4.11.5
+++ b/metadata/md5-cache/kde-base/kscreensaver-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE screensaver framework
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kcheckpass-4.11.5:4[aqua=] x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=080b17726feec397d6ea91fb63437f51
+_md5_=c734e4c6c1a0244e20ab1f6d72491456
diff --git a/metadata/md5-cache/kde-base/kshisen-4.11.5 b/metadata/md5-cache/kde-base/kshisen-4.11.5
index c741716ce507..5349abb63cdf 100644
--- a/metadata/md5-cache/kde-base/kshisen-4.11.5
+++ b/metadata/md5-cache/kde-base/kshisen-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A KDE game similiar to Mahjongg
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kshisen/ http://games.kde.org/game.php?game=kshisen
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/libkmahjongg-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kshisen-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6d7689b30260f235557f11aa65c2eb2f
+_md5_=71f89fa660376807267c5d416a0b09d9
diff --git a/metadata/md5-cache/kde-base/ksirk-4.11.5 b/metadata/md5-cache/kde-base/ksirk-4.11.5
index 032ae5d7a6ff..3a84b48861eb 100644
--- a/metadata/md5-cache/kde-base/ksirk-4.11.5
+++ b/metadata/md5-cache/kde-base/ksirk-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Ksirk is a KDE port of the board game risk
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/ksirk/ http://games.kde.org/game.php?game=ksirk
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/libkdegames-4.11.5:4[aqua=] sys-libs/zlib >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksirk-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d949006df793cc2b5773f12840cb4fe7
+_md5_=d7ec4ff6433bcea57565fbfab74033bb
diff --git a/metadata/md5-cache/kde-base/ksmserver-4.11.5 b/metadata/md5-cache/kde-base/ksmserver-4.11.5
index 543f38dcb8b5..084755f7ddc1 100644
--- a/metadata/md5-cache/kde-base/ksmserver-4.11.5
+++ b/metadata/md5-cache/kde-base/ksmserver-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The reliable KDE session manager that talks the standard X11R6
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kcminit-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] media-libs/qimageblitz x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrender >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8769a13f38062c4f1fd72f2d683f5215
+_md5_=f0f000aabf5b68fdd73a274ff2386b6c
diff --git a/metadata/md5-cache/kde-base/ksnakeduel-4.11.5 b/metadata/md5-cache/kde-base/ksnakeduel-4.11.5
index 6388c0d82fee..76a976fdfe7a 100644
--- a/metadata/md5-cache/kde-base/ksnakeduel-4.11.5
+++ b/metadata/md5-cache/kde-base/ksnakeduel-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Tron game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/ksnakeduel/
 IUSE=debug selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] !kde-base/ktron:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksnakeduel-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6403bfa000f761b79a189fc70e90d152
+_md5_=ba0edbb339174842111cce46e81bf423
diff --git a/metadata/md5-cache/kde-base/ksnapshot-4.11.5 b/metadata/md5-cache/kde-base/ksnapshot-4.11.5
index aa0f32db76a8..e08d7a4ebbcd 100644
--- a/metadata/md5-cache/kde-base/ksnapshot-4.11.5
+++ b/metadata/md5-cache/kde-base/ksnapshot-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Screenshot Utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/graphics/ksnapshot/
 IUSE=debug kipi +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXfixes !aqua? ( x11-libs/libX11 x11-libs/libXext ) kipi? ( >=kde-base/libkipi-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksnapshot-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=802fded210d5a5310eb7006e772836a3
+_md5_=23f33e6ac9ab1a82a65ec1503651bac5
diff --git a/metadata/md5-cache/kde-base/kspaceduel-4.11.5 b/metadata/md5-cache/kde-base/kspaceduel-4.11.5
index 7bf698ff3bf0..9fe51587fe04 100644
--- a/metadata/md5-cache/kde-base/kspaceduel-4.11.5
+++ b/metadata/md5-cache/kde-base/kspaceduel-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Space Game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kspaceduel/ http://games.kde.org/game.php?game=kspaceduel
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kspaceduel-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6e819ebade9c3cdf2ecc3409f3dc85f0
+_md5_=c8bc7847aa2aeb11ba589dc09045a545
diff --git a/metadata/md5-cache/kde-base/ksplash-4.11.5 b/metadata/md5-cache/kde-base/ksplash-4.11.5
index ee108402da07..f2ad360e7ee1 100644
--- a/metadata/md5-cache/kde-base/ksplash-4.11.5
+++ b/metadata/md5-cache/kde-base/ksplash-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE splashscreen framework (the splashscreen of KDE itself, not of i
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=3dnow altivec debug mmx sse sse2 xinerama aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-libs/libXinerama ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c230e14431636279e253f4048e3b380d
+_md5_=8d35afe88719a7811839bf7ff6906fca
diff --git a/metadata/md5-cache/kde-base/ksquares-4.11.5 b/metadata/md5-cache/kde-base/ksquares-4.11.5
index d10805f8fce3..ebd9af1edec2 100644
--- a/metadata/md5-cache/kde-base/ksquares-4.11.5
+++ b/metadata/md5-cache/kde-base/ksquares-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KSquares is an implementation of the game squares for KDE4
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/ksquares/ http://games.kde.org/game.php?game=ksquares
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksquares-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=863511a3b27556dbcdb7c4c0f8388321
+_md5_=8642c478996850cbf2493b53d3f63c7b
diff --git a/metadata/md5-cache/kde-base/kstars-4.11.5 b/metadata/md5-cache/kde-base/kstars-4.11.5
index d04bc6788e7c..b1ebbfd179d3 100644
--- a/metadata/md5-cache/kde-base/kstars-4.11.5
+++ b/metadata/md5-cache/kde-base/kstars-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Desktop Planetarium
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kstars http://edu.kde.org/kstars
 IUSE=debug fits indi +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:2 >=kde-base/libkdeedu-4.11.5:4[aqua=] fits? ( >=sci-libs/cfitsio-0.390 ) indi? ( >=sci-libs/indilib-0.9.1 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kstars-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0792eccbcd87459454e6a0f3a9c36458
+_md5_=64db58dfda028778d7975565c1a09927
diff --git a/metadata/md5-cache/kde-base/kstart-4.11.5 b/metadata/md5-cache/kde-base/kstart-4.11.5
index 5b326e934484..1dddd18ed0ad 100644
--- a/metadata/md5-cache/kde-base/kstart-4.11.5
+++ b/metadata/md5-cache/kde-base/kstart-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Utility to launch applications with special window properties
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3220043dc3a7e65312d2ed4ad61caaa8
+_md5_=f3c7fd52729399d4fb22127c0c060391
diff --git a/metadata/md5-cache/kde-base/kstartperf-4.10.5 b/metadata/md5-cache/kde-base/kstartperf-4.10.5
deleted file mode 100644
index 84380d0b29ef..000000000000
--- a/metadata/md5-cache/kde-base/kstartperf-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=Measures starting performance of applications
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.10.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kdesdk-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=14b0740ca3cd140ee72e88dc03242036
diff --git a/metadata/md5-cache/kde-base/kstartupconfig-4.11.5 b/metadata/md5-cache/kde-base/kstartupconfig-4.11.5
index 7f3c739ffe56..932fa08ff5ec 100644
--- a/metadata/md5-cache/kde-base/kstartupconfig-4.11.5
+++ b/metadata/md5-cache/kde-base/kstartupconfig-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Utility to launch applications with special window properties
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a56e44ed39a4ad0a5e7b200763045186
+_md5_=b2bf20c4b405f6642fa224c476b8657c
diff --git a/metadata/md5-cache/kde-base/kstyles-4.11.5 b/metadata/md5-cache/kde-base/kstyles-4.11.5
index 76f72c0caf2a..f09723695de1 100644
--- a/metadata/md5-cache/kde-base/kstyles-4.11.5
+++ b/metadata/md5-cache/kde-base/kstyles-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A set of different KDE styles.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/liboxygenstyle-4.11.5:4[aqua=] x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2fbc100eb7727f0cd976117826719e44
+_md5_=fef4a6fca1bd811edd46a2009afe414e
diff --git a/metadata/md5-cache/kde-base/ksudoku-4.11.5 b/metadata/md5-cache/kde-base/ksudoku-4.11.5
index d5e6753dfefe..d0e7e1c8b4ce 100644
--- a/metadata/md5-cache/kde-base/ksudoku-4.11.5
+++ b/metadata/md5-cache/kde-base/ksudoku-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Sudoku
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/ksudoku/ http://games.kde.org/game.php?game=ksudoku
 IUSE=debug opengl +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] opengl? ( virtual/glu ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksudoku-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b148a8f40bbbf3f5dd42a31a473350df
+_md5_=2b2a028f8a7aae5be78238e936ecdfa5
diff --git a/metadata/md5-cache/kde-base/ksysguard-4.11.5 b/metadata/md5-cache/kde-base/ksysguard-4.11.5
index bd818fd95c1e..6575ca1561a1 100644
--- a/metadata/md5-cache/kde-base/ksysguard-4.11.5
+++ b/metadata/md5-cache/kde-base/ksysguard-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KSysguard is a network enabled task manager and system monitor appli
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KSysGuard
 IUSE=debug lm_sensors test test test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8f5348937ede795cddbf34dd03b8ef6a
+_md5_=c5363a3dfad3efd5b1d93475cc0093a5
diff --git a/metadata/md5-cache/kde-base/ksystemlog-4.11.5 b/metadata/md5-cache/kde-base/ksystemlog-4.11.5
index 2ee1b68cbb7a..d3ad9e6d0f6f 100644
--- a/metadata/md5-cache/kde-base/ksystemlog-4.11.5
+++ b/metadata/md5-cache/kde-base/ksystemlog-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE system log viewer
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/ksystemlog/
 IUSE=debug test test +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ksystemlog-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=821c59bf1725f4f6fc92a66a237b2a49
+_md5_=c5a0bca03f42cbdc48f6002610530770
diff --git a/metadata/md5-cache/kde-base/ksystraycmd-4.11.5 b/metadata/md5-cache/kde-base/ksystraycmd-4.11.5
index 39be634c1587..d26fe59b2bb7 100644
--- a/metadata/md5-cache/kde-base/ksystraycmd-4.11.5
+++ b/metadata/md5-cache/kde-base/ksystraycmd-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Ksystraycmd embeds applications given as argument into the system tr
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8abe52e220e7cd886cad5bd706ff5a1a
+_md5_=f7e0d5cb74085e046c02daf46469b83d
diff --git a/metadata/md5-cache/kde-base/kteatime-4.11.5 b/metadata/md5-cache/kde-base/kteatime-4.11.5
index 477bf523a43f..08e742f6116f 100644
--- a/metadata/md5-cache/kde-base/kteatime-4.11.5
+++ b/metadata/md5-cache/kde-base/kteatime-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE timer for making a fine cup of tea
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kteatime
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kteatime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d65d00e37d8333191a191f8c970602ce
+_md5_=b37760dd90a8170a7ec2b1188ace3549
diff --git a/metadata/md5-cache/kde-base/ktimer-4.11.5 b/metadata/md5-cache/kde-base/ktimer-4.11.5
index 7d60a70eabad..096af073a8fe 100644
--- a/metadata/md5-cache/kde-base/ktimer-4.11.5
+++ b/metadata/md5-cache/kde-base/ktimer-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Timer
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/ktimer http://utils.kde.org/projects/ktimer
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ktimer-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=62f11eb556ae859e6565ec949b1c4fe8
+_md5_=7d59b87d3e59b2e542823248004f9ff3
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.11.5 b/metadata/md5-cache/kde-base/ktimetracker-4.11.5
index a7d51c1c51ce..33a39a3ba223 100644
--- a/metadata/md5-cache/kde-base/ktimetracker-4.11.5
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KTimeTracker tracks time spent on various tasks.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua +kontact
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepim-kresources-4.11.5:4[aqua=] >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/kdepim-common-libs-4.11.5:4[aqua=] x11-libs/libXScrnSaver >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] kontact? ( >=kde-base/kontact-4.11.5:4[aqua=] )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6b9ee7702caebb4b1d1a320e1acc3c90
+_md5_=0b650c116cc70bc1146d5901c581c7f8
diff --git a/metadata/md5-cache/kde-base/ktimezoned-4.11.5 b/metadata/md5-cache/kde-base/ktimezoned-4.11.5
index c5eabf05ea21..b0474806dd7e 100644
--- a/metadata/md5-cache/kde-base/ktimezoned-4.11.5
+++ b/metadata/md5-cache/kde-base/ktimezoned-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Timezone daemon
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=35e7b7a76ed675352ea237bc94119799
+_md5_=8c026efb4e90dc895da4b62d36216df5
diff --git a/metadata/md5-cache/kde-base/ktnef-4.11.5 b/metadata/md5-cache/kde-base/ktnef-4.11.5
index 42d23557266e..d14b9cd2fbe0 100644
--- a/metadata/md5-cache/kde-base/ktnef-4.11.5
+++ b/metadata/md5-cache/kde-base/ktnef-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A viewer for TNEF attachments.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=app-office/akonadi-server-1.9.51 >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdepim-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=39512316be99e781e536ea39d2503535
+_md5_=474661eab8b42711e46eb8cdf88065d4
diff --git a/metadata/md5-cache/kde-base/ktnef-4.12.1 b/metadata/md5-cache/kde-base/ktnef-4.12.1
index f0cf8b05ecf7..e2b622ddd239 100644
--- a/metadata/md5-cache/kde-base/ktnef-4.12.1
+++ b/metadata/md5-cache/kde-base/ktnef-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=A viewer for TNEF attachments.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=app-office/akonadi-server-1.10.45 >=kde-base/kdepimlibs-4.12.1:4[aqua=] >=kde-base/oxygen-icons-4.12.1:4[aqua=] handbook? ( >=kde-base/kdelibs-4.12.1:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/kdepim-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9d3cd41accdea165ba5a396d229bac9a
+_md5_=4196b61698b4006d05045c22d3f88abf
diff --git a/metadata/md5-cache/kde-base/ktouch-4.11.5 b/metadata/md5-cache/kde-base/ktouch-4.11.5
index 20c0942da3e8..d18d9b77e55d 100644
--- a/metadata/md5-cache/kde-base/ktouch-4.11.5
+++ b/metadata/md5-cache/kde-base/ktouch-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A program that helps you to learn and practice touch typing
 EAPI=5
 HOMEPAGE=http://edu.kde.org/applications/miscellaneous/ktouch
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/plasma-workspace-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ktouch-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=37fa056009d2803f2bcbbcc0ff6612e7
+_md5_=a40ac40e846940fa3e50cb846e35cfdf
diff --git a/metadata/md5-cache/kde-base/ktraderclient-4.11.5 b/metadata/md5-cache/kde-base/ktraderclient-4.11.5
index 9048fefbc64b..b55d7360e813 100644
--- a/metadata/md5-cache/kde-base/ktraderclient-4.11.5
+++ b/metadata/md5-cache/kde-base/ktraderclient-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line tool for querying the KDE trader system
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9a56074faa2da85ca93d76f5a49fd6b9
+_md5_=bbdb55e6dd4ea5ba8e102ab301892613
diff --git a/metadata/md5-cache/kde-base/ktuberling-4.11.5 b/metadata/md5-cache/kde-base/ktuberling-4.11.5
index 2e1b13ab812e..0fa97beb8be2 100644
--- a/metadata/md5-cache/kde-base/ktuberling-4.11.5
+++ b/metadata/md5-cache/kde-base/ktuberling-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: potato game for kids
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/ktuberling/ http://games.kde.org/game.php?game=ktuberling
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ktuberling-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e9c5ed1916fb0baabf7e8a33b59f69ac
+_md5_=897ec9d66621fa5272c77f4d2ba93180
diff --git a/metadata/md5-cache/kde-base/kturtle-4.11.5 b/metadata/md5-cache/kde-base/kturtle-4.11.5
index 4f81574a4b64..f14ac7e00621 100644
--- a/metadata/md5-cache/kde-base/kturtle-4.11.5
+++ b/metadata/md5-cache/kde-base/kturtle-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Educational programming environment using the Logo programming
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kturtle http://edu.kde.org/kturtle
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kturtle-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d47cffd222fa29469dda56c4e78a64ac
+_md5_=a3f9abf363912b2d4f48532c084c8e5a
diff --git a/metadata/md5-cache/kde-base/ktux-4.11.5 b/metadata/md5-cache/kde-base/ktux-4.11.5
index d06b4cb0beab..00eb009760b9 100644
--- a/metadata/md5-cache/kde-base/ktux-4.11.5
+++ b/metadata/md5-cache/kde-base/ktux-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: screensaver featuring the Space-Faring Tux
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KTux
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kscreensaver-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/ktux-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4238105c235a135927bfa3dc412da71e
+_md5_=cefe0fce18ff9367c64b1a48d7ab2553
diff --git a/metadata/md5-cache/kde-base/kubrick-4.11.5 b/metadata/md5-cache/kde-base/kubrick-4.11.5
index 1af0745613be..3f8323c56e1c 100644
--- a/metadata/md5-cache/kde-base/kubrick-4.11.5
+++ b/metadata/md5-cache/kde-base/kubrick-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A game based on the "Rubik's Cube" puzzle.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/kubrick/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] virtual/glu >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kubrick-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4987bb6d560d341c5f18cf171e97c851
+_md5_=25bfd3211ac30e638ab7720cfe9d0980
diff --git a/metadata/md5-cache/kde-base/kuiserver-4.11.5 b/metadata/md5-cache/kde-base/kuiserver-4.11.5
index eff45b967532..4c5cfef38b96 100644
--- a/metadata/md5-cache/kde-base/kuiserver-4.11.5
+++ b/metadata/md5-cache/kde-base/kuiserver-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Progress Info UI server
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a37254733625a8e30b3d2984b0aec31a
+_md5_=f34a50108e0bc9dfa07c44a559727b30
diff --git a/metadata/md5-cache/kde-base/kuiviewer-4.10.5 b/metadata/md5-cache/kde-base/kuiviewer-4.10.5
deleted file mode 100644
index 75c0cb56bffb..000000000000
--- a/metadata/md5-cache/kde-base/kuiviewer-4.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=KDE utility that displays and tests UI files generated by Qt Designer.
-EAPI=5
-HOMEPAGE=http://www.kde.org/applications/development/kuiviewer/
-IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.10.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kdesdk-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=51805cd5e65171b3f21e6734272485ee
diff --git a/metadata/md5-cache/kde-base/kurifilter-plugins-4.11.5 b/metadata/md5-cache/kde-base/kurifilter-plugins-4.11.5
index 7edf1f7897ea..119568cb5774 100644
--- a/metadata/md5-cache/kde-base/kurifilter-plugins-4.11.5
+++ b/metadata/md5-cache/kde-base/kurifilter-plugins-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE: Plugins to manage filtering URIs.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4ca325606253f09df5f19c8c0ec061bc
+_md5_=24a39313160ae247a7d1e69e6ff01d78
diff --git a/metadata/md5-cache/kde-base/kuser-4.11.5 b/metadata/md5-cache/kde-base/kuser-4.11.5
index 3efeae8390b7..c834168a9066 100644
--- a/metadata/md5-cache/kde-base/kuser-4.11.5
+++ b/metadata/md5-cache/kde-base/kuser-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE application that helps you manage system users
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/kuser/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/knotify-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kuser-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1ae7f058e80193db37e165397a331a7d
+_md5_=6f8e453768aa1ab820ea05501225e49b
diff --git a/metadata/md5-cache/kde-base/kwallet-4.11.5 b/metadata/md5-cache/kde-base/kwallet-4.11.5
index c334e2dcbc61..b9af0ab245a2 100644
--- a/metadata/md5-cache/kde-base/kwallet-4.11.5
+++ b/metadata/md5-cache/kde-base/kwallet-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Wallet Management Tool
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kwallet-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e0945b2a9de79de1130e220bb5e43233
+_md5_=eb3cdf91bd7a7b07a04a4839eba51829
diff --git a/metadata/md5-cache/kde-base/kwalletd-4.11.5 b/metadata/md5-cache/kde-base/kwalletd-4.11.5
index 0772f0045ba2..1d992b5814f8 100644
--- a/metadata/md5-cache/kde-base/kwalletd-4.11.5
+++ b/metadata/md5-cache/kde-base/kwalletd-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Password Server
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2e85911a151c24c42751f65d3ac97919
+_md5_=94693c42987b34518c3aafad46967b7b
diff --git a/metadata/md5-cache/kde-base/kwin-4.11.5 b/metadata/md5-cache/kde-base/kwin-4.11.5
index a1a6799d3f6e..945644f7a186 100644
--- a/metadata/md5-cache/kde-base/kwin-4.11.5
+++ b/metadata/md5-cache/kde-base/kwin-4.11.5
@@ -4,7 +4,7 @@ DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KWin
 IUSE=debug gles opengl wayland aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/kdelibs-4.11.5:4[aqua=,opengl] >=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/liboxygenstyle-4.11.5:4[aqua=] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender x11-libs/libXxf86vm opengl? ( >=media-libs/mesa-7.10 ) gles? ( >=media-libs/mesa-7.12[egl(+),gles2] ) wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] ) x11-apps/scripts >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9db040a568845577b457b2d6aa5a3025
+_md5_=d2c4360ed3f1f4dd8b4a5e0b7cab1f2b
diff --git a/metadata/md5-cache/kde-base/kwordquiz-4.11.5 b/metadata/md5-cache/kde-base/kwordquiz-4.11.5
index ffc3e1b4fbae..98dba9190406 100644
--- a/metadata/md5-cache/kde-base/kwordquiz-4.11.5
+++ b/metadata/md5-cache/kde-base/kwordquiz-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: A powerful flashcard and vocabulary learning program
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/kwordquiz http://edu.kde.org/kwordquiz
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kwordquiz-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=df82a8c3304ddcfbfad9aa306d9c895b
+_md5_=fbb66f8d6162df71441d7e074c113aca
diff --git a/metadata/md5-cache/kde-base/kwrite-4.11.5 b/metadata/md5-cache/kde-base/kwrite-4.11.5
index 5bfecd3f58be..6ec43b1971fc 100644
--- a/metadata/md5-cache/kde-base/kwrite-4.11.5
+++ b/metadata/md5-cache/kde-base/kwrite-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE MDI editor/IDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/kwrite
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/katepart-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kate-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aa4a2463675e9e00a95c3ea2f4ea2690
+_md5_=6b7644962601e306044ca98cc7af26d2
diff --git a/metadata/md5-cache/kde-base/kwrited-4.11.5 b/metadata/md5-cache/kde-base/kwrited-4.11.5
index f638bd332acc..15d524459b79 100644
--- a/metadata/md5-cache/kde-base/kwrited-4.11.5
+++ b/metadata/md5-cache/kde-base/kwrited-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE daemon listening for wall and write messages.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7fa9148e23cfd0eafbee790d97f322ba
+_md5_=a9b10db6379a5f98727423c43187c16e
diff --git a/metadata/md5-cache/kde-base/libkcddb-4.11.5 b/metadata/md5-cache/kde-base/libkcddb-4.11.5
index ed8de5d99419..132386593436 100644
--- a/metadata/md5-cache/kde-base/libkcddb-4.11.5
+++ b/metadata/md5-cache/kde-base/libkcddb-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE library for CDDB
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug musicbrainz aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkcddb-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=168ada4381c84620b7a64e2147ffdbef
+_md5_=d638c89f21fe1eecae0574f3e595f3f9
diff --git a/metadata/md5-cache/kde-base/libkcompactdisc-4.11.5 b/metadata/md5-cache/kde-base/libkcompactdisc-4.11.5
index f82acd9581fb..85e8f1f750c0 100644
--- a/metadata/md5-cache/kde-base/libkcompactdisc-4.11.5
+++ b/metadata/md5-cache/kde-base/libkcompactdisc-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE library for playing & ripping CDs
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=alsa debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkcompactdisc-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=31d7da0284128cd859eecc5ec69ea566
+_md5_=59780037c782bf40048df6db3194792c
diff --git a/metadata/md5-cache/kde-base/libkdcraw-4.11.5 b/metadata/md5-cache/kde-base/libkdcraw-4.11.5
index 389d84e3f063..493ef158aac6 100644
--- a/metadata/md5-cache/kde-base/libkdcraw-4.11.5
+++ b/metadata/md5-cache/kde-base/libkdcraw-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE digital camera raw image library wrapper
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libraw-0.15:= >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkdcraw-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7ddab3a0e6507e4b7b60d434988ec4a3
+_md5_=3c803d92a966602d1495e68a883113ad
diff --git a/metadata/md5-cache/kde-base/libkdeedu-4.11.5 b/metadata/md5-cache/kde-base/libkdeedu-4.11.5
index 6f7ecea32ba6..607cd1a64e8a 100644
--- a/metadata/md5-cache/kde-base/libkdeedu-4.11.5
+++ b/metadata/md5-cache/kde-base/libkdeedu-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Common library for KDE educational apps
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkdeedu-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=47b20284ac425b927f540918a7d9da41
+_md5_=71b668167e8c8b12082845b2d481e1ad
diff --git a/metadata/md5-cache/kde-base/libkdegames-4.11.5 b/metadata/md5-cache/kde-base/libkdegames-4.11.5
index a5f16cb8e435..6f0a0d132bdd 100644
--- a/metadata/md5-cache/kde-base/libkdegames-4.11.5
+++ b/metadata/md5-cache/kde-base/libkdegames-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Base library common to many KDE games.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug openal aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=openal? ( media-libs/libsndfile media-libs/openal ) !<kde-base/kbreakout-4.10.50:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkdegames-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a09959586083bc55bf9e41e3ee1f14b4
+_md5_=5b4eaa61c9fbc637b87e194817439a54
diff --git a/metadata/md5-cache/kde-base/libkexiv2-4.11.5 b/metadata/md5-cache/kde-base/libkexiv2-4.11.5
index cca76ade141b..9239d1d638f8 100644
--- a/metadata/md5-cache/kde-base/libkexiv2-4.11.5
+++ b/metadata/md5-cache/kde-base/libkexiv2-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +xmp aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.20:=[xmp=] virtual/jpeg:0 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkexiv2-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b5719f9496461336a7fcd34635533254
+_md5_=82dbbb56f5225723b0770e04a2edab7d
diff --git a/metadata/md5-cache/kde-base/libkipi-4.11.5 b/metadata/md5-cache/kde-base/libkipi-4.11.5
index fba75ebaeb35..1aee95306444 100644
--- a/metadata/md5-cache/kde-base/libkipi-4.11.5
+++ b/metadata/md5-cache/kde-base/libkipi-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A library for image plugins accross KDE applications.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkipi-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4caba26cdcd1c23c7170abb01b441422
+_md5_=b564df3bb62924ca11bc485187e9e2f8
diff --git a/metadata/md5-cache/kde-base/libkmahjongg-4.11.5 b/metadata/md5-cache/kde-base/libkmahjongg-4.11.5
index a81aa02d6b46..21d3ea516e4b 100644
--- a/metadata/md5-cache/kde-base/libkmahjongg-4.11.5
+++ b/metadata/md5-cache/kde-base/libkmahjongg-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=LibKMahjongg for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libkmahjongg-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ca2b9b1555a5e162f3d1d234b0257ee5
+_md5_=2c36b5baeb34efe6eb8587f2ae5d9985
diff --git a/metadata/md5-cache/kde-base/libkomparediff2-4.12.1 b/metadata/md5-cache/kde-base/libkomparediff2-4.12.1
index 830a76d39389..7a7868fa4ab7 100644
--- a/metadata/md5-cache/kde-base/libkomparediff2-4.12.1
+++ b/metadata/md5-cache/kde-base/libkomparediff2-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE library to compare files and strings
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<=kde-base/kompare-4.11.50 >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/libkomparediff2-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a24edf5ae6650ade230b62afb54f5578
+_md5_=18906cf3441d5fbdbbce02c58969153d
diff --git a/metadata/md5-cache/kde-base/libkonq-4.11.5 b/metadata/md5-cache/kde-base/libkonq-4.11.5
index 07119e176970..df98367952e8 100644
--- a/metadata/md5-cache/kde-base/libkonq-4.11.5
+++ b/metadata/md5-cache/kde-base/libkonq-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=The embeddable part of konqueror
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e7d03f4d77d4a2ad387749811c637002
+_md5_=5d6089ea9fe8ac1ac77d0e9f907c407b
diff --git a/metadata/md5-cache/kde-base/libksane-4.11.5 b/metadata/md5-cache/kde-base/libksane-4.11.5
index 0c1d6ea6fd8e..3a7927c3cdf2 100644
--- a/metadata/md5-cache/kde-base/libksane-4.11.5
+++ b/metadata/md5-cache/kde-base/libksane-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=SANE Library interface for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-gfx/sane-backends >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/libksane-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2f844b3b92a0c77fb3a1be8c50aa05e3
+_md5_=503ba3c16eb33d4955b5a93e780ce640
diff --git a/metadata/md5-cache/kde-base/libkworkspace-4.11.5 b/metadata/md5-cache/kde-base/libkworkspace-4.11.5
index 109c62cde20e..57146fe856e3 100644
--- a/metadata/md5-cache/kde-base/libkworkspace-4.11.5
+++ b/metadata/md5-cache/kde-base/libkworkspace-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A library for KDE desktop applications
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXau >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f5fbf4ee0bd8c607d3fe8a2f3844ab92
+_md5_=a7027133b82599bf6e8b319eb2f294d6
diff --git a/metadata/md5-cache/kde-base/liboxygenstyle-4.11.5 b/metadata/md5-cache/kde-base/liboxygenstyle-4.11.5
index ce199ed348b1..1fd9ee633d38 100644
--- a/metadata/md5-cache/kde-base/liboxygenstyle-4.11.5
+++ b/metadata/md5-cache/kde-base/liboxygenstyle-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Library to support the Oxygen style in KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4ca843d03237c0c18b1097718bd80cec
+_md5_=618fd535ab23503b8e905bf00a29e4ec
diff --git a/metadata/md5-cache/kde-base/libplasmaclock-4.11.5 b/metadata/md5-cache/kde-base/libplasmaclock-4.11.5
index 29726a08097c..9a5f4a5cd0d5 100644
--- a/metadata/md5-cache/kde-base/libplasmaclock-4.11.5
+++ b/metadata/md5-cache/kde-base/libplasmaclock-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for KDE Plasma's clocks
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.11.5:4[aqua=] semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e8c3446b82ad97a974b87e419e87977b
+_md5_=3dc39b8ab0278b9b045498abcca8ee42
diff --git a/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.5 b/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.5
index d0f40aa0a893..3dc7a984845b 100644
--- a/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.5
+++ b/metadata/md5-cache/kde-base/libplasmagenericshell-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the KDE Plasma shell
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=efc752d2947a9404285b76de3973b4bc
+_md5_=acceb52a2647c0f5bcfd73be0b3639ef
diff --git a/metadata/md5-cache/kde-base/libtaskmanager-4.11.5 b/metadata/md5-cache/kde-base/libtaskmanager-4.11.5
index 49f3c6d46e04..a84bc783bb6d 100644
--- a/metadata/md5-cache/kde-base/libtaskmanager-4.11.5
+++ b/metadata/md5-cache/kde-base/libtaskmanager-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides basic taskmanager functionality
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/ksysguard-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] x11-libs/libX11 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3b94adf8a78061077216dc6ba9c896e7
+_md5_=0a740ed7509f0b6e59a5874a128b7c79
diff --git a/metadata/md5-cache/kde-base/lokalize-4.11.5 b/metadata/md5-cache/kde-base/lokalize-4.11.5
index d50fb65f7d8d..253f7947b587 100644
--- a/metadata/md5-cache/kde-base/lokalize-4.11.5
+++ b/metadata/md5-cache/kde-base/lokalize-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE4 translation tool
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
 IUSE=debug semantic-desktop python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=app-text/hunspell-1.2.8 >=dev-qt/qtsql-4.5.0:4[sqlite] semantic-desktop? ( >=dev-libs/soprano-2.9.0 ) >=kde-base/kdesdk-strigi-analyzer-4.11.5:4[aqua=] >=kde-base/krosspython-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/pykde4-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/lokalize-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dbcb1631c8773de314242cfed21ff727
+_md5_=379844c764a2be534860b29290d7d658
diff --git a/metadata/md5-cache/kde-base/lskat-4.11.5 b/metadata/md5-cache/kde-base/lskat-4.11.5
index 8a0dfe3013ea..7c1faa9cea7a 100644
--- a/metadata/md5-cache/kde-base/lskat-4.11.5
+++ b/metadata/md5-cache/kde-base/lskat-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Skat game for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/lskat/ http://games.kde.org/game.php?game=lskat
 IUSE=debug +handbook selinux aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] selinux? ( sec-policy/selinux-games )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/lskat-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ae596b4606ec36debfe05f33ba3e483f
+_md5_=e787ec64592526b8ba36fc6540a8ee63
diff --git a/metadata/md5-cache/kde-base/marble-4.11.5 b/metadata/md5-cache/kde-base/marble-4.11.5
index 36bade9a6316..e9d08703bdf2 100644
--- a/metadata/md5-cache/kde-base/marble-4.11.5
+++ b/metadata/md5-cache/kde-base/marble-4.11.5
@@ -4,7 +4,7 @@ DESCRIPTION=Generic geographical map widget
 EAPI=5
 HOMEPAGE=http://marble.kde.org/
 IUSE=debug designer-plugin gps +kde plasma python shapefile test zip test +handbook aqua kde python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/PyQt4-4.4.4-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] kde? ( >=kde-base/pykde4-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip ) kde? ( >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=] )
 REQUIRED_USE=plasma? ( kde ) python? ( kde )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/marble-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=63ecdd5ac8fc34e95e4f8047121d36e3
+_md5_=a049f8d91537c83ea2c4cefdefd67a48
diff --git a/metadata/md5-cache/kde-base/mplayerthumbs-4.11.5 b/metadata/md5-cache/kde-base/mplayerthumbs-4.11.5
index 296776c0cabd..609bcd0651af 100644
--- a/metadata/md5-cache/kde-base/mplayerthumbs-4.11.5
+++ b/metadata/md5-cache/kde-base/mplayerthumbs-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A Thumbnail Generator for Video Files on KDE filemanagers.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=kde-base/dolphin-4.11.5:4[aqua=] >=kde-base/konqueror-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/mplayerthumbs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=05fbf60842182b4f8db6972c467f26ac
+_md5_=4385b7ce338310ee3008b3ebbcca79db
diff --git a/metadata/md5-cache/kde-base/nepomuk-4.11.5 b/metadata/md5-cache/kde-base/nepomuk-4.11.5
index 7428155fc9b8..b5c83a16530b 100644
--- a/metadata/md5-cache/kde-base/nepomuk-4.11.5
+++ b/metadata/md5-cache/kde-base/nepomuk-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Nepomuk KDE4 client
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/Nepomuk
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/soprano-2.9.0[dbus,raptor,redland,virtuoso] >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop] >=kde-base/nepomuk-core-4.11.5:4[aqua=] !kde-misc/nepomukcontroller >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e07555d6a70af5eaf0c42bde4b15387c
+_md5_=a99c2a60057f08c2711137b1608e4a8a
diff --git a/metadata/md5-cache/kde-base/nepomuk-core-4.11.5 b/metadata/md5-cache/kde-base/nepomuk-core-4.11.5
index 0d0a4027abcc..9f8084e5ad75 100644
--- a/metadata/md5-cache/kde-base/nepomuk-core-4.11.5
+++ b/metadata/md5-cache/kde-base/nepomuk-core-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Nepomuk core libraries
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug epub exif ffmpeg pdf taglib aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso] epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) !<kde-base/nepomuk-4.8.80:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/nepomuk-core-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ef20b1adaae9f1a468de258f42fc08d8
+_md5_=5a0495712b635c7643df3b67ed1d51dc
diff --git a/metadata/md5-cache/kde-base/nepomuk-widgets-4.11.5 b/metadata/md5-cache/kde-base/nepomuk-widgets-4.11.5
index f1da4ef43939..2514c8edc02b 100644
--- a/metadata/md5-cache/kde-base/nepomuk-widgets-4.11.5
+++ b/metadata/md5-cache/kde-base/nepomuk-widgets-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Widget library for nepomuk
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/nepomuk-core-4.11.5:4[aqua=] >=dev-libs/soprano-2.9.0 !<kde-base/nepomuk-core-4.9.80:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/nepomuk-widgets-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=93c480a6fb558b8fe33f40256522e000
+_md5_=e05e3c2cdf3357599fc92ea2b8ae7c9c
diff --git a/metadata/md5-cache/kde-base/nsplugins-4.11.5 b/metadata/md5-cache/kde-base/nsplugins-4.11.5
index c7519d1875f5..39ef1f926272 100644
--- a/metadata/md5-cache/kde-base/nsplugins-4.11.5
+++ b/metadata/md5-cache/kde-base/nsplugins-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Netscape plugins support for Konqueror.
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-base/konqueror-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8747dccd73d71da6caf488bc516b86e6
+_md5_=0bcaf748f5d26d49334316cda59e2b58
diff --git a/metadata/md5-cache/kde-base/okteta-4.11.5 b/metadata/md5-cache/kde-base/okteta-4.11.5
index 6b6cb87cd4ca..2e9350e9b35e 100644
--- a/metadata/md5-cache/kde-base/okteta-4.11.5
+++ b/metadata/md5-cache/kde-base/okteta-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE hexeditor
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/okteta http://utils.kde.org/projects/okteta
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/okteta-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bf228f2e1fc91be1b60bdb1b7c0daaec
+_md5_=276b7329f80184dc31e7e36992e08ead
diff --git a/metadata/md5-cache/kde-base/okular-4.11.5 b/metadata/md5-cache/kde-base/okular-4.11.5
index 81f63d9f6106..0b8d705f5b6d 100644
--- a/metadata/md5-cache/kde-base/okular-4.11.5
+++ b/metadata/md5-cache/kde-base/okular-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Okular is a universal document viewer based on KPDF for KDE 4.
 EAPI=5
 HOMEPAGE=http://okular.kde.org http://www.kde.org/applications/graphics/okular
 IUSE=chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 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.20[qt4,-exceptions(-)] ) postscript? ( app-text/libspectre ) tiff? ( media-libs/tiff ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/okular-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=67299d70511acb959d08c059fc45ea68
+_md5_=e0108ed7e72dd0066da6c799c3e10c04
diff --git a/metadata/md5-cache/kde-base/oxygen-icons-4.11.5 b/metadata/md5-cache/kde-base/oxygen-icons-4.11.5
index e40a09e15260..c817ebba8d5d 100644
--- a/metadata/md5-cache/kde-base/oxygen-icons-4.11.5
+++ b/metadata/md5-cache/kde-base/oxygen-icons-4.11.5
@@ -4,9 +4,9 @@ DESCRIPTION=Oxygen SVG icon theme.
 EAPI=5
 HOMEPAGE=http://www.oxygen-icons.org/
 IUSE=bindist aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=4/4.11
 SRC_URI=!bindist? ( http://dev.gentoo.org/~creffett/distfiles/oxygen-icons-4.11.5.repacked.tar.xz ) bindist? ( mirror://kde/stable/4.11.5/src/oxygen-icons-4.11.5.tar.xz )
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a56aebbb063dd51afb7266661e5d100c
+_md5_=c408c51806ad2bbbe4e655b2a9e60889
diff --git a/metadata/md5-cache/kde-base/pairs-4.11.5 b/metadata/md5-cache/kde-base/pairs-4.11.5
index 3f06f192932a..048a49c208e4 100644
--- a/metadata/md5-cache/kde-base/pairs-4.11.5
+++ b/metadata/md5-cache/kde-base/pairs-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE memory and pairs game
 EAPI=5
 HOMEPAGE=http://edu.kde.org/applications/miscellaneous/pairs
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/pairs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c53158f2c654a47a2da5a60132e7a78a
+_md5_=7712ead122f9fbe283c0d8b6fab270fd
diff --git a/metadata/md5-cache/kde-base/palapeli-4.11.5 b/metadata/md5-cache/kde-base/palapeli-4.11.5
index feffd41f9dbe..6422a9ded3c6 100644
--- a/metadata/md5-cache/kde-base/palapeli-4.11.5
+++ b/metadata/md5-cache/kde-base/palapeli-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE jigsaw puzzle game
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/games/palapeli/
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/palapeli-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6ed8f1ce1df46760d628f46b12a1a86f
+_md5_=ec8649170ea8b39143be57858cde56c9
diff --git a/metadata/md5-cache/kde-base/parley-4.11.5 b/metadata/md5-cache/kde-base/parley-4.11.5
index 223eee508fa8..ac71d44d6b1f 100644
--- a/metadata/md5-cache/kde-base/parley-4.11.5
+++ b/metadata/md5-cache/kde-base/parley-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Educational: vocabulary trainer
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/parley http://edu.kde.org/applications/school/parley
 IUSE=debug +plasma +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdeedu-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/parley-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cf1c409f325e13f22f020d50ce8b027a
+_md5_=d753d08e32a6d93534e068e8cb70d131
diff --git a/metadata/md5-cache/kde-base/perlkde-4.11.5 b/metadata/md5-cache/kde-base/perlkde-4.11.5
index 85db60a5e9e8..ad0be7e12e2e 100644
--- a/metadata/md5-cache/kde-base/perlkde-4.11.5
+++ b/metadata/md5-cache/kde-base/perlkde-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Perl bindings
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=akonadi attica debug kate okular semantic-desktop test aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 >=kde-base/perlqt-4.11.5:4[aqua=] >=kde-base/smokekde-4.11.5:4[aqua=,attica?,kate?,okular?,semantic-desktop?] semantic-desktop? ( >=dev-libs/soprano-2.9.0 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/perlkde-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=101f728030190c6d3f4f50cf62b9dc00
+_md5_=1a6baf23d38d1c7dc354c46b45c97da5
diff --git a/metadata/md5-cache/kde-base/perlqt-4.11.5 b/metadata/md5-cache/kde-base/perlqt-4.11.5
index af81b2689688..2fbf5162208d 100644
--- a/metadata/md5-cache/kde-base/perlqt-4.11.5
+++ b/metadata/md5-cache/kde-base/perlqt-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Qt Perl bindings
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug phonon qimageblitz qscintilla qwt webkit test declarative qthelp opengl multimedia aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10.1 dev-perl/List-MoreUtils >=kde-base/smokeqt-4.11.5:4[aqua=,declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?] declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) qthelp? ( >=dev-qt/qthelp-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/perlqt-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=deac2725b791c0c63ac80837bbffda9c
+_md5_=870de717a30a531605898e32777b9955
diff --git a/metadata/md5-cache/kde-base/phonon-kde-4.11.5 b/metadata/md5-cache/kde-base/phonon-kde-4.11.5
index a5d9676198e6..ee3b6712343a 100644
--- a/metadata/md5-cache/kde-base/phonon-kde-4.11.5
+++ b/metadata/md5-cache/kde-base/phonon-kde-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Phonon KDE Integration
 EAPI=5
 HOMEPAGE=http://phonon.kde.org
 IUSE=alsa debug pulseaudio aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 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.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dfa6f75f45645c4e3e9bec39ae2528c7
+_md5_=1426c8c6709b1ebe2f5f7ad562f3f743
diff --git a/metadata/md5-cache/kde-base/picmi-4.11.5 b/metadata/md5-cache/kde-base/picmi-4.11.5
index 86f8652bfe86..27427d6391dd 100644
--- a/metadata/md5-cache/kde-base/picmi-4.11.5
+++ b/metadata/md5-cache/kde-base/picmi-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Nonogram logic game for KDE
 EAPI=5
 HOMEPAGE=http://games.kde.org/game.php?game=picmi
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/picmi-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6bae465dad97c87df878ab3695b925a8
+_md5_=0d159d7397d38e4ab10939f5da745a1f
diff --git a/metadata/md5-cache/kde-base/picmi-4.12.1 b/metadata/md5-cache/kde-base/picmi-4.12.1
index e54faafea099..223969c04847 100644
--- a/metadata/md5-cache/kde-base/picmi-4.12.1
+++ b/metadata/md5-cache/kde-base/picmi-4.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Nonogram logic game for KDE
 EAPI=5
 HOMEPAGE=http://games.kde.org/game.php?game=picmi
 IUSE=debug aqua
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdegames-4.12.1:4[aqua=] >=kde-base/oxygen-icons-4.12.1:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.12.1:4[aqua=]
 RESTRICT=test
 SLOT=4/4.12
 SRC_URI=mirror://kde/stable/4.12.1/src/picmi-4.12.1.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=804a546abed169b85c3e92f45494a374
+_md5_=7917d849c2f1366fcecb1cdb2ecf6888
diff --git a/metadata/md5-cache/kde-base/plasma-apps-4.11.5 b/metadata/md5-cache/kde-base/plasma-apps-4.11.5
index 640f16280422..dcaf7f9b4166 100644
--- a/metadata/md5-cache/kde-base/plasma-apps-4.11.5
+++ b/metadata/md5-cache/kde-base/plasma-apps-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Additional Applets for Plasma
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkonq-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-baseapps-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a0bc68c3bbb91c83cf8de0dfc1d2971e
+_md5_=ea9a28e1a5008931690c6ae5bccea236
diff --git a/metadata/md5-cache/kde-base/plasma-runtime-4.11.5 b/metadata/md5-cache/kde-base/plasma-runtime-4.11.5
index 140630b1c6c3..1494ccf4e729 100644
--- a/metadata/md5-cache/kde-base/plasma-runtime-4.11.5
+++ b/metadata/md5-cache/kde-base/plasma-runtime-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Script engine and package tool for plasma
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f41a9021faf9406cd01f2bd83ced571d
+_md5_=27df7d85ab1d85bb474316e05aee01d7
diff --git a/metadata/md5-cache/kde-base/plasma-workspace-4.11.5 b/metadata/md5-cache/kde-base/plasma-workspace-4.11.5
index 59508f437e60..2343a3fe15a1 100644
--- a/metadata/md5-cache/kde-base/plasma-workspace-4.11.5
+++ b/metadata/md5-cache/kde-base/plasma-workspace-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Plasma: KDE desktop framework
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug gps json python qalculate semantic-desktop python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libdbusmenu-qt >=dev-qt/qtcore-4.8.4-r3:4 !kde-misc/ktouchpadenabler >=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/kephal-4.11.5:4[aqua=] >=kde-base/ksysguard-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] >=kde-base/libplasmaclock-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/libplasmagenericshell-4.11.5:4[aqua=] >=kde-base/libtaskmanager-4.11.5:4[aqua=] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender gps? ( >=sci-geosciences/gpsd-2.37 ) json? ( dev-libs/qjson ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/PyQt4-4.4.0[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/pykde4-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qalculate? ( sci-libs/libqalculate ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=kde-base/nepomuk-core-4.11.5:4[aqua=] ) >=kde-base/plasma-runtime-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.0:4 >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e2c68bd9e32c3f09bb38de324ce5d063
+_md5_=55bcd6f73402dbb3a3802f35967b5223
diff --git a/metadata/md5-cache/kde-base/powerdevil-4.11.5 b/metadata/md5-cache/kde-base/powerdevil-4.11.5
index 0e4b228e08b4..74139e783a7f 100644
--- a/metadata/md5-cache/kde-base/powerdevil-4.11.5
+++ b/metadata/md5-cache/kde-base/powerdevil-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=PowerDevil is an utility for KDE4 for Laptop Powermanagement.
 EAPI=5
 HOMEPAGE=http://solid.kde.org
 IUSE=debug +pm-utils aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kactivities-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) pm-utils? ( sys-power/pm-utils ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=27f4590ce0f5e49e1b8c4f24af7be4a1
+_md5_=0a081290983f218590032f367cd9b069
diff --git a/metadata/md5-cache/kde-base/poxml-4.11.5 b/metadata/md5-cache/kde-base/poxml-4.11.5
index 82ea5bca2607..0d0f3ccfc881 100644
--- a/metadata/md5-cache/kde-base/poxml-4.11.5
+++ b/metadata/md5-cache/kde-base/poxml-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug extras elibc_FreeBSD extras elibc_FreeBSD aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=extras? ( >=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[cxx,java,script] ) !<=kde-base/kdesdk-misc-4.10.50:4 extras? ( >=dev-java/java-config-2.1.9-r1 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/poxml-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0087b689e8136824da0dab78fe384b65
+_md5_=d69596473248d43ddd5a63fd848bc9ea
diff --git a/metadata/md5-cache/kde-base/print-manager-4.11.5 b/metadata/md5-cache/kde-base/print-manager-4.11.5
index 5420e1b91327..30bfbf39d82d 100644
--- a/metadata/md5-cache/kde-base/print-manager-4.11.5
+++ b/metadata/md5-cache/kde-base/print-manager-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Manage print jobs and printers in KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=net-print/cups-1.5.0[dbus] !kde-base/printer-applet:4 !kde-base/system-config-printer-kde:4 !kde-misc/print-manager app-admin/system-config-printer-gnome >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/print-manager-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=86e0415dc991c9ea84822da78389b7e0
+_md5_=90c776fd3c4e7be4bcd469817ab10fe4
diff --git a/metadata/md5-cache/kde-base/pykde4-4.11.5 b/metadata/md5-cache/kde-base/pykde4-4.11.5
index 37fd0e0fce48..a306fd97dfdf 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.11.5
+++ b/metadata/md5-cache/kde-base/pykde4-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for KDE4
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Python
 IUSE=debug doc examples semantic-desktop test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.9.5[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),dbus,declarative,script(+),sql,svg,webkit,X] >=dev-python/sip-4.14:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=kde-base/kdelibs-4.11.5:4[aqua=,opengl,semantic-desktop?] semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] >=dev-libs/soprano-2.9.0 ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] >=dev-qt/qtopengl-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) test? ( semantic-desktop )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/pykde4-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=823be8538ebbd6c564f6396af050e05f
+_md5_=928aa3dc9bf4db12450084f03a7a47a5
diff --git a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.5 b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.5
index 58b656724123..5ff6556bf3df 100644
--- a/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.5
+++ b/metadata/md5-cache/kde-base/qguiplatformplugin_kde-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Helps integration of pure Qt applications with KDE Workspace
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=946bbc3716a225438ec8014cdd6e9504
+_md5_=691e6582439508509c3face97e62795e
diff --git a/metadata/md5-cache/kde-base/qtruby-4.11.5 b/metadata/md5-cache/kde-base/qtruby-4.11.5
index 61bbf136f3fd..f27f77e7c114 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.11.5
+++ b/metadata/md5-cache/kde-base/qtruby-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=Qt Ruby bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Ruby
 IUSE=debug phonon qscintilla qwt webkit declarative aqua elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/smokeqt-4.11.5:4[aqua=,declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?] declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) >=dev-qt/qtopengl-4.8.0:4 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/qtruby-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=402f2695ad051a774b6f2762e1c48580
+_md5_=92a30ce900af51e1369738dcb5e51c13
diff --git a/metadata/md5-cache/kde-base/qyoto-4.11.5 b/metadata/md5-cache/kde-base/qyoto-4.11.5
index 73e0fbdea9cb..d23ad21a2391 100644
--- a/metadata/md5-cache/kde-base/qyoto-4.11.5
+++ b/metadata/md5-cache/kde-base/qyoto-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=C# bindings for Qt
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Qyoto
 IUSE=debug +phonon qscintilla webkit aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/mono >=kde-base/smokeqt-4.11.5:4[aqua=,opengl,phonon?,qscintilla?,webkit?]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/qyoto-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cad8e29bfe70b2b72d8be497fc7e967c
+_md5_=dac00c5591cdf420772d7e68b0df33a2
diff --git a/metadata/md5-cache/kde-base/renamedlg-plugins-4.11.5 b/metadata/md5-cache/kde-base/renamedlg-plugins-4.11.5
index 8071782c9d5e..f47d7e4234f5 100644
--- a/metadata/md5-cache/kde-base/renamedlg-plugins-4.11.5
+++ b/metadata/md5-cache/kde-base/renamedlg-plugins-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE RenameDlg plugins
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eed730771ea766facbd8c2ef36b1ca9c
+_md5_=e618107a954fff2a4f8ece33aec5fcd4
diff --git a/metadata/md5-cache/kde-base/rocs-4.11.5 b/metadata/md5-cache/kde-base/rocs-4.11.5
index 333678617e3e..292f233a1780 100644
--- a/metadata/md5-cache/kde-base/rocs-4.11.5
+++ b/metadata/md5-cache/kde-base/rocs-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE4 interface to work with Graph Theory
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/education/rocs http://edu.kde.org/applications/mathematics/rocs
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee dev-qt/qtxmlpatterns:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/rocs-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4995b4b7ae5a52a624652657bb43cb16
+_md5_=328ec3d510fa244cb65724d0c61e3d5c
diff --git a/metadata/md5-cache/kde-base/smokegen-4.11.5 b/metadata/md5-cache/kde-base/smokegen-4.11.5
index aaf4413772dd..52dd5bb99ed7 100644
--- a/metadata/md5-cache/kde-base/smokegen-4.11.5
+++ b/metadata/md5-cache/kde-base/smokegen-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Scripting Meta Object Kompiler Engine - generators
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Smoke
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/smokegen-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=58d07c2e941758a4041905ff3b14dc63
+_md5_=8813f6938269c2c48ab5135bd7294cd0
diff --git a/metadata/md5-cache/kde-base/smokekde-4.11.5 b/metadata/md5-cache/kde-base/smokekde-4.11.5
index 5637acb90e36..de4f3d7014f0 100644
--- a/metadata/md5-cache/kde-base/smokekde-4.11.5
+++ b/metadata/md5-cache/kde-base/smokekde-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Scripting Meta Object Kompiler Engine - KDE bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Smoke
 IUSE=attica debug kate okular semantic-desktop aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.11.5:4[aqua=,semantic-desktop?] >=kde-base/smokeqt-4.11.5:4[aqua=] attica? ( dev-libs/libattica ) kate? ( >=kde-base/kate-4.11.5:4[aqua=] ) okular? ( >=kde-base/okular-4.11.5:4[aqua=] ) semantic-desktop? ( >=kde-base/kdepimlibs-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/smokekde-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f562f802288dccc957a89507061f0ffe
+_md5_=afd01e7725cfee9b825fd590a1df687d
diff --git a/metadata/md5-cache/kde-base/smokeqt-4.11.5 b/metadata/md5-cache/kde-base/smokeqt-4.11.5
index 4d242f1a48e1..b839925b714b 100644
--- a/metadata/md5-cache/kde-base/smokeqt-4.11.5
+++ b/metadata/md5-cache/kde-base/smokeqt-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Scripting Meta Object Kompiler Engine - Qt bindings
 EAPI=5
 HOMEPAGE=http://techbase.kde.org/Development/Languages/Smoke
 IUSE=debug +phonon qimageblitz qscintilla qwt webkit declarative qthelp opengl multimedia aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/smokegen-4.11.5:4[aqua=] dev-qt/qtcore:4 dev-qt/qtdbus:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qttest:4 phonon? ( >=media-libs/phonon-4.4.3 ) qimageblitz? ( >=media-libs/qimageblitz-0.0.4 ) qscintilla? ( x11-libs/qscintilla:= ) qwt? ( x11-libs/qwt:5[svg] ) webkit? ( dev-qt/qtwebkit:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) qthelp? ( >=dev-qt/qthelp-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/smokeqt-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fc1e52d818995290b4b5c524c41eea74
+_md5_=716277ad794857cd98291a0abdb7b466
diff --git a/metadata/md5-cache/kde-base/solid-4.10.5 b/metadata/md5-cache/kde-base/solid-4.10.5
deleted file mode 100644
index d871be2e4e4e..000000000000
--- a/metadata/md5-cache/kde-base/solid-4.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-DESCRIPTION=Solid: the KDE hardware library
-EAPI=5
-HOMEPAGE=http://solid.kde.org
-IUSE=debug bluetooth networkmanager wicd aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-PDEPEND=bluetooth? ( net-wireless/bluedevil )
-RDEPEND=networkmanager? ( net-misc/networkmanager ) wicd? ( net-misc/wicd ) >=kde-base/solid-runtime-4.10.5:4[aqua=] >=kde-base/oxygen-icons-4.10.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10.5:4[aqua=]
-SLOT=4/4.10
-SRC_URI=mirror://kde/stable/4.10.5/src/kde-workspace-4.10.5.tar.xz
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2a56d3ea0eb55b4daab4ef109e23a994
diff --git a/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.5 b/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.5
index 45a64c13327c..4f35f7bbeb2d 100644
--- a/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.5
+++ b/metadata/md5-cache/kde-base/solid-actions-kcm-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE control module for Solid actions
 EAPI=5
 HOMEPAGE=http://solid.kde.org
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/solid-runtime-4.11.5:4[aqua=] !kde-base/solid:4 >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1dffaef0118b177b098a0394d3c5a375
+_md5_=3fc458f728694d240d6a32790e1168f3
diff --git a/metadata/md5-cache/kde-base/solid-runtime-4.11.5 b/metadata/md5-cache/kde-base/solid-runtime-4.11.5
index 42feadc69178..af7c13100d34 100644
--- a/metadata/md5-cache/kde-base/solid-runtime-4.11.5
+++ b/metadata/md5-cache/kde-base/solid-runtime-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE SC solid runtime modules (autoeject, automounter and others)
 EAPI=5
 HOMEPAGE=http://solid.kde.org
 IUSE=debug bluetooth networkmanager aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluedevil ) networkmanager? ( || ( kde-misc/networkmanagement kde-misc/plasma-nm ) ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-runtime-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1d1cd8a503de589936b817e1f9a56fae
+_md5_=f90825ac52157cd8aaa67f2dbcce3b79
diff --git a/metadata/md5-cache/kde-base/step-4.11.5 b/metadata/md5-cache/kde-base/step-4.11.5
index b7225733f881..be047a160af9 100644
--- a/metadata/md5-cache/kde-base/step-4.11.5
+++ b/metadata/md5-cache/kde-base/step-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=The KDE physics simulator
 EAPI=5
 HOMEPAGE=http://edu.kde.org/step
 IUSE=debug +gsl +qalculate +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 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.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/step-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=79e06aa7ed4031d558870a3861e322d5
+_md5_=233b3035eb3693a730e38660952d12fe
diff --git a/metadata/md5-cache/kde-base/superkaramba-4.11.5 b/metadata/md5-cache/kde-base/superkaramba-4.11.5
index 7b698e74b629..872c846fea8a 100644
--- a/metadata/md5-cache/kde-base/superkaramba-4.11.5
+++ b/metadata/md5-cache/kde-base/superkaramba-4.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=A tool to create interactive applets for the KDE desktop.
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/superkaramba http://utils.kde.org/projects/superkaramba
 IUSE=debug python python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/qimageblitz x11-libs/libX11 x11-libs/libXrender python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=kde-base/pykde4-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python? ( >=kde-base/krosspython-4.11.5:4[aqua=,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/superkaramba-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2c76e33edbd76eeda2f49e0c988e466c
+_md5_=1b2d592de8b0cc6a86652e1766cf7f3a
diff --git a/metadata/md5-cache/kde-base/svgpart-4.11.5 b/metadata/md5-cache/kde-base/svgpart-4.11.5
index b0a7478bf920..03873e213120 100644
--- a/metadata/md5-cache/kde-base/svgpart-4.11.5
+++ b/metadata/md5-cache/kde-base/svgpart-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=Svgpart is a kpart for viewing SVGs
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/svgpart-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b3825d7431982131bb15b6f81bee7395
+_md5_=696e5bd02ae9a061ef9a4d8d35e0f036
diff --git a/metadata/md5-cache/kde-base/sweeper-4.11.5 b/metadata/md5-cache/kde-base/sweeper-4.11.5
index cfde23f80ff7..fe28cf76f63a 100644
--- a/metadata/md5-cache/kde-base/sweeper-4.11.5
+++ b/metadata/md5-cache/kde-base/sweeper-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Privacy Settings Widget
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/utilities/sweeper http://utils.kde.org/projects/sweeper
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/sweeper-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3b6ccc63dad67fc21f200b872ffd7574
+_md5_=098a3d818922d53a1c86e4313aac80e3
diff --git a/metadata/md5-cache/kde-base/systemsettings-4.11.5 b/metadata/md5-cache/kde-base/systemsettings-4.11.5
index b8d1311cff73..57c6773933dc 100644
--- a/metadata/md5-cache/kde-base/systemsettings-4.11.5
+++ b/metadata/md5-cache/kde-base/systemsettings-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/System_Settings
 IUSE=debug gtk semantic-desktop +usb test opengl +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-misc/strigi dev-libs/glib:2 >=kde-base/kwin-4.11.5:4[aqua=] >=kde-base/libkworkspace-4.11.5:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libxkbfile 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 ) semantic-desktop? ( >=kde-base/nepomuk-4.11.5:4[aqua=] ) >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kde-workspace-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=19a3510e516f34bdb0d27c444683e570
+_md5_=029340dd726f2b181f32a2491de4457e
diff --git a/metadata/md5-cache/kde-base/thumbnailers-4.11.5 b/metadata/md5-cache/kde-base/thumbnailers-4.11.5
index 8e6558a679c9..d0c547240ec8 100644
--- a/metadata/md5-cache/kde-base/thumbnailers-4.11.5
+++ b/metadata/md5-cache/kde-base/thumbnailers-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE 4 thumbnail generators for PDF/PS files
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkdcraw-4.11.5:4[aqua=] >=kde-base/libkexiv2-4.11.5:4[aqua=] >=kde-base/oxygen-icons-4.11.5:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/kdegraphics-thumbnailers-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=241676001a63ffdb363f12b4e53d7f44
+_md5_=847dd46df631df8a55a16a1973224cf6
diff --git a/metadata/md5-cache/kde-base/umbrello-4.11.5 b/metadata/md5-cache/kde-base/umbrello-4.11.5
index 80ac32311621..5a2d116d7c13 100644
--- a/metadata/md5-cache/kde-base/umbrello-4.11.5
+++ b/metadata/md5-cache/kde-base/umbrello-4.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE UML Modeller
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/development/umbrello http://umbrello.kde.org
 IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=kde-base/oxygen-icons-4.11.5:4[aqua=] handbook? ( >=kde-base/kdelibs-4.11.5:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11.5:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.11.5/src/umbrello-4.11.5.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=39b55d26d867751568ed515b134e7601
+_md5_=18b4c24c696724e424e3f31aba9014cb
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.3.3 b/metadata/md5-cache/kde-misc/kwebkitpart-1.3.3
index 38e5337b562c..535246c87012 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.3.3
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=A WebKit KPart for konqueror
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kwebkitpart
 IUSE=debug aqua
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/kwebkitpart-1.3.3.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=23035c22450e80df7538cf935ff04f40
+_md5_=28701dec019c303a1f7e7e3616fce8e6
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11.0 b/metadata/md5-cache/mail-mta/postfix-2.11.0
index eaa67ec0bc3b..a4477f7aeee6 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.11.0
+++ b/metadata/md5-cache/mail-mta/postfix-2.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail.
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.0.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a28b97ee5b19674eccde31ada36945db
+_md5_=23aeb1314b39499bf41a0df0ca53029c
diff --git a/metadata/md5-cache/mail-mta/postfix-2.12_pre20140109 b/metadata/md5-cache/mail-mta/postfix-2.12_pre20140109
index 9045f275bdba..cd5d30cbebb2 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.12_pre20140109
+++ b/metadata/md5-cache/mail-mta/postfix-2.12_pre20140109
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail.
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.12-20140109.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0538eab60eed704b10aadb214fff9c27
+_md5_=f007d445bf6d7bbc4788740aad3f3bf4
diff --git a/metadata/md5-cache/media-gfx/digikam-3.5.0 b/metadata/md5-cache/media-gfx/digikam-3.5.0
index 21242b722cee..0c7f856f0b18 100644
--- a/metadata/md5-cache/media-gfx/digikam-3.5.0
+++ b/metadata/md5-cache/media-gfx/digikam-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Digital photo management application for KDE
 EAPI=5
 HOMEPAGE=http://www.digikam.org/
 IUSE=addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@Latn linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_uz@cyrillic linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-base/kdelibs-4.10:4[aqua=,semantic-desktop(+)?] >=kde-base/kdebase-kioslaves-4.10:4[aqua=] kde-base/libkdcraw:4= kde-base/libkexiv2:4= >=kde-base/libkipi-4.10:4[aqua=] kde-base/marble:4=[plasma] media-libs/jasper media-libs/lcms:2 media-libs/lensfun >=media-libs/libkface-3.3.0 media-libs/libkgeomap media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= media-libs/tiff virtual/jpeg dev-qt/qtgui:4[qt3support] || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] ) addressbook? ( >=kde-base/kdepimlibs-4.10:4[aqua=] ) gphoto2? ( media-libs/libgphoto2:= ) mysql? ( virtual/mysql ) >=kde-base/kreadconfig-4.10:4[aqua=] media-plugins/kipi-plugins video? ( || ( >=kde-base/mplayerthumbs-4.10:4[aqua=] >=kde-base/ffmpegthumbs-4.10:4[aqua=] ) ) >=kde-base/oxygen-icons-4.10:4[aqua=] linguas_af? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_af(+)] ) linguas_ar? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr@Latn(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uz(+)] ) linguas_uz@cyrillic? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uz@cyrillic(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=93bc33b796428ad798f1b0dc38bff39a
+_md5_=7a27bd45ff5e90d2d4bba0c240df5da6
diff --git a/metadata/md5-cache/media-gfx/feh-2.9.3 b/metadata/md5-cache/media-gfx/feh-2.9.3
index 6bfab46b7010..4992d3ef167f 100644
--- a/metadata/md5-cache/media-gfx/feh-2.9.3
+++ b/metadata/md5-cache/media-gfx/feh-2.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=A fast, lightweight imageviewer using imlib2
 EAPI=5
 HOMEPAGE=http://feh.finalrewind.org/
 IUSE=debug curl exif test xinerama
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 ~x86
 LICENSE=feh
 RDEPEND=>=media-libs/giblib-1.2.4 media-libs/imlib2 >=media-libs/libpng-1.2:0 x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 SLOT=0
 SRC_URI=http://feh.finalrewind.org/feh-2.9.3.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=145ef640169450323d049197b5cc0b86
+_md5_=c1d3c5622021f96bd9e6a5c5b4019ce2
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.0.2 b/metadata/md5-cache/media-gfx/pngquant-2.0.2
new file mode 100644
index 000000000000..4a19a4995b4d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngquant-2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libpng:0= sys-libs/zlib:=
+DESCRIPTION=a command-line utility for converting 24/32-bit PNG images to paletted (8-bit) PNGs
+EAPI=5
+HOMEPAGE=http://pngquant.org/
+IUSE=debug openmp sse2
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND rwpng
+RDEPEND=media-libs/libpng:0= sys-libs/zlib:=
+SLOT=0
+SRC_URI=http://pngquant.org/pngquant-2.0.2-src.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=107ca17a515c37477866f3ee7e6a0aae
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.3.1 b/metadata/md5-cache/media-gfx/qrencode-3.3.1
index afc6c7aba68c..edd20bd22f2a 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.3.1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.3.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || (
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
-KEYWORDS=amd64 arm ~ia64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.3.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2baaf03f570616126e55bc6dce11e19d
+_md5_=f6940efa913237017c185e4fcc100bca
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r1
index 074597e6cce7..3e67904ef1f9 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=5
 HOMEPAGE=http://www.sane-project.org/
 IUSE=avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 +sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek +sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg media-libs/tiff ) 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:1 ) gphoto2? ( media-libs/libgphoto2:= virtual/jpeg ) v4l? ( media-libs/libv4l ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd ) !<sys-fs/udev-114
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e8572cf07b81a8ac252fb0a2e5e4b350
+_md5_=837ac540ec8abc409eebf4540a6bd665
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.3 b/metadata/md5-cache/media-gfx/viewnior-1.3
index 2759ff1567f1..5a6e0bf2a53a 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.3
+++ b/metadata/md5-cache/media-gfx/viewnior-1.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info >=sys-ap
 DESCRIPTION=Fast and simple image viewer
 EAPI=4
 HOMEPAGE=http://xsisqox.github.com/Viewnior/index.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.20:2 x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://github/xsisqox/Viewnior/viewnior-1.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2d8cee56b39b8824d339b2eaa5c509e0
+_md5_=687e97bcbc6f42d4034c2f9552953238
diff --git a/metadata/md5-cache/media-libs/faac-1.28-r4 b/metadata/md5-cache/media-libs/faac-1.28-r4
index 2a28d92f66e5..e460d9efb2e1 100644
--- a/metadata/md5-cache/media-libs/faac-1.28-r4
+++ b/metadata/md5-cache/media-libs/faac-1.28-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=5
 HOMEPAGE=http://www.audiocoding.com
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MPEG-4
 RDEPEND=media-libs/libmp4v2:0= abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1.28.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4b8207220efab5721fb1b879c5378529
+_md5_=3c1576f945c524d3c8e91237f53fe632
diff --git a/metadata/md5-cache/media-libs/glyr-1.0.1 b/metadata/md5-cache/media-libs/glyr-1.0.1
index 53ff1c88d06f..f8a4aeec82a8 100644
--- a/metadata/md5-cache/media-libs/glyr-1.0.1
+++ b/metadata/md5-cache/media-libs/glyr-1.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.10:2 net-misc/curl virtual/pkgconfig sy
 DESCRIPTION=A music related metadata searchengine, both with commandline interface and C API
 EAPI=5
 HOMEPAGE=http://github.com/sahib/glyr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.10:2 net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/sahib/glyr/archive/1.0.1.tar.gz -> glyr-1.0.1.tar.gz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=29c787eb243542e91aa45881aa076094
+_md5_=69b58747d2adb30411704ee3b43f5073
diff --git a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2 b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
index 777e78d93287..a81b2651918c 100644
--- a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
+++ b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The Linux Audio Developer's Simple Plugin API
 EAPI=5
 HOMEPAGE=http://www.ladspa.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/ladspa_sdk_1.13.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9322ffbbedbb55fb61369cdb900e9c0e
+_md5_=3f1ef1fcb89c5da1ca8352e8ec87ff33
diff --git a/metadata/md5-cache/media-libs/lensfun-0.2.5-r2 b/metadata/md5-cache/media-libs/lensfun-0.2.5-r2
deleted file mode 100644
index bee7adbf2861..000000000000
--- a/metadata/md5-cache/media-libs/lensfun-0.2.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/glib-2 >=media-libs/libpng-1.2 || ( dev-lang/python:2.7 dev-lang/python:2.6 ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.0 )
-DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
-EAPI=2
-HOMEPAGE=http://lensfun.berlios.de/
-IUSE=debug doc
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-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.tar.bz2
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c2a3fb13d3b05c346fa8457f9faaee1d
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
deleted file mode 100644
index 06f9ddd7134c..000000000000
--- a/metadata/md5-cache/media-libs/lensfun-0.2.5_p153-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2 >=media-libs/libpng-1.2 doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
-EAPI=4
-HOMEPAGE=http://lensfun.berlios.de/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
-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_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=691a0c3d60f650d23c2e897c240b4fd1
diff --git a/metadata/md5-cache/media-libs/lensfun-0.2.6 b/metadata/md5-cache/media-libs/lensfun-0.2.6
deleted file mode 100644
index 81c0f5daee9d..000000000000
--- a/metadata/md5-cache/media-libs/lensfun-0.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0 sys-libs/zlib doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
-EAPI=4
-HOMEPAGE=http://lensfun.berlios.de/
-IUSE=doc sse sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-3 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0 sys-libs/zlib || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://berlios/lensfun/lensfun-0.2.6.tar.bz2
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a3e6f165bc2760f92a774cd4e3424db4
diff --git a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1 b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
index f077c53a38af..0819f81bf61d 100644
--- a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
+++ b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=reference implementation of the net-color spec
 EAPI=5
 HOMEPAGE=http://www.oyranos.org/libxcm/
 IUSE=X doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=X? ( x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/oyranos/libXcm/libXcm-0.4.x/libXcm-0.5.2.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=478561d0e2faf744362bd6d0738a35a5
+_md5_=8844f8571276b3389aa34cf0812a721d
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index 2b5c15648537..a196b0f61972 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cue File library from Musepack
 EAPI=5
 HOMEPAGE=http://www.musepack.net/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
 _eclasses_=cmake-multilib	8339f7796a9fe34e9c2e8d5288e183e8	cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9b276366941da3158e8fecfadace12b8
+_md5_=8fe349159b01674adb76994723ab3e45
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.5-r3 b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
index e117a3211e3d..96994a26da3c 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.5-r3
+++ b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding DTS Coherent Acoustics streams used in DVD
 EAPI=5
 HOMEPAGE=http://www.videolan.org/developers/libdca.html
 IUSE=debug oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!media-libs/libdts abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 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	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=debe954a70872165083a57f48f4f0459
+_md5_=a51be92e2edcf4aa27bdbc4eb4a95d10
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1 b/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
index 47284e21b105..d4ad6bfa3a29 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A portable abstraction library for DVD decryption
 EAPI=5
 HOMEPAGE=http://www.videolan.org/developers/libdvdcss.html
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8d4841459e6be292dbe8872bda4b7f39
+_md5_=cd17b7d84d15f00bf7a5f5ada528d66d
diff --git a/metadata/md5-cache/media-libs/libfame-0.9.1-r2 b/metadata/md5-cache/media-libs/libfame-0.9.1-r2
index 6655c80f16de..60c95faa681c 100644
--- a/metadata/md5-cache/media-libs/libfame-0.9.1-r2
+++ b/metadata/md5-cache/media-libs/libfame-0.9.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=MPEG-1 and MPEG-4 video encoding library
 EAPI=5
 HOMEPAGE=http://fame.sourceforge.net/
 IUSE=mmx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-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=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fame/libfame-0.9.1.tar.gz http://digilander.libero.it/dgp85/gentoo/libfame-patches-2.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=872dea5497b3d390234ef42bcb2f5964
+_md5_=2f4510bb8d3dcf29999acd16b0feb95b
diff --git a/metadata/md5-cache/media-libs/libgii-1.0.2-r1 b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
index 4c32c15f59ea..1396c2558b7f 100644
--- a/metadata/md5-cache/media-libs/libgii-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and safe graphics and drivers for about any graphics card to th
 EAPI=5
 HOMEPAGE=http://www.ggi-project.org
 IUSE=X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libgii-1.0.2.src.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1a64380e57bf9831c26d045e982df653
+_md5_=d39da18254c32ac1ee827a3cecf3faa0
diff --git a/metadata/md5-cache/media-libs/libkface-3.5.0 b/metadata/md5-cache/media-libs/libkface-3.5.0
index d0e5a82bee12..07f0d40b7457 100644
--- a/metadata/md5-cache/media-libs/libkface-3.5.0
+++ b/metadata/md5-cache/media-libs/libkface-3.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt/C++ wrapper around LibFace to perform face recognition and detect
 EAPI=5
 HOMEPAGE=http://www.digikam.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencv-2.4.5 >=kde-base/oxygen-icons-4.10:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=42f5ef78e02b33f26e7908aedda80836
+_md5_=f1d7a55caa700e060a7bd7999d8cb34d
diff --git a/metadata/md5-cache/media-libs/libkgeomap-3.5.0 b/metadata/md5-cache/media-libs/libkgeomap-3.5.0
index ce970047de23..59953d668934 100644
--- a/metadata/md5-cache/media-libs/libkgeomap-3.5.0
+++ b/metadata/md5-cache/media-libs/libkgeomap-3.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wrapper library for world map components as marble, openstreetmap an
 EAPI=5
 HOMEPAGE=http://www.digikam.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/libkexiv2-4.10:4[aqua=] >=kde-base/marble-4.10:4[aqua=,kde,plasma] >=kde-base/oxygen-icons-4.10:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=819bbd67b011d9f124758de468efe9a4
+_md5_=7a48178cd6660dc528cd082f23b78e17
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.65 b/metadata/md5-cache/media-libs/libmediainfo-0.7.65
index d38316cff387..e6af127f95dc 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.65
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.65
@@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo libraries
 EAPI=5
 HOMEPAGE=http://mediaarea.net/mediainfo/
 IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2 >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/libmediainfo_0.7.65.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7f7ec4925a08d6daefdebb0d2181d52a
+_md5_=f490decbbff2b61f0854b83f7c892d3c
diff --git a/metadata/md5-cache/media-libs/libmms-0.6.2-r1 b/metadata/md5-cache/media-libs/libmms-0.6.2-r1
index b9f97eb6f58b..bf7423cc7a1b 100644
--- a/metadata/md5-cache/media-libs/libmms-0.6.2-r1
+++ b/metadata/md5-cache/media-libs/libmms-0.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Common library for accessing Microsoft Media Server (MMS) media stre
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/libmms/ http://launchpad.net/libmms/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmms/libmms-0.6.2.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ece1996e340716b55bfaacbe6514aabd
+_md5_=58b1024b82efa2f72f01b2e043035ecf
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.9 b/metadata/md5-cache/media-libs/libmpdclient-2.9
index 6e8f18d4c849..17d21fd00967 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.9
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.9
@@ -4,8 +4,8 @@ DESCRIPTION=A library for interfacing Music Player Daemon (media-sound/mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
 IUSE=doc examples static-libs
-KEYWORDS=amd64 arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm hppa ppc ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.9.tar.xz
-_md5_=6283979b8b33bbca42dd191f19184c3a
+_md5_=61ec09872a9be70df1c6c53af9a1f859
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index 278532147785..80cf442e1aa0 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Replay Gain library from Musepack
 EAPI=5
 HOMEPAGE=http://www.musepack.net/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
 _eclasses_=cmake-multilib	8339f7796a9fe34e9c2e8d5288e183e8	cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=01f7246a987da0b44fb315dc95958b4f
+_md5_=57879aba0812a14401a35be0ea9dac92
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
index 600cf78587db..63445fde77f5 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=30cf425cae52af45c9b7a42f76d83783
+_md5_=8e8dcb625ca725f9711d33edb6f4b534
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35 b/metadata/md5-cache/media-libs/zvbi-0.2.35
index 89115a9f5f42..e28a7cbf49cf 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35
@@ -4,10 +4,10 @@ DESCRIPTION=VBI Decoding Library for Zapping
 EAPI=5
 HOMEPAGE=http://zapping.sourceforge.net
 IUSE=doc dvb nls static-libs v4l X
-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 LGPL-2
 RDEPEND=>=media-libs/libpng-1.4 sys-libs/zlib nls? ( virtual/libintl ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3e77129538b22283ecad10bc31eee1ad
+_md5_=e77c78848438a592ce8a9b0eb3da9d3b
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-3.5.0 b/metadata/md5-cache/media-plugins/kipi-plugins-3.5.0
index 7adb27171f41..d407a408ca18 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-3.5.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Plugins for the KDE Image Plugin Interface
 EAPI=5
 HOMEPAGE=http://www.digikam.org/
 IUSE=cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-base/libkipi-4.10:4[aqua=] kde-base/libkdcraw:4= kde-base/libkexiv2:4= dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( media-libs/libkgeomap ) media-libs/libpng:0= media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.10:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) mediawiki? ( >=net-libs/libmediawiki-3.0.0 ) redeyes? ( media-libs/opencv ) scanner? ( >=kde-base/libksane-4.10:4[aqua=] media-gfx/sane-backends ) upnp? ( media-libs/herqq ) videoslideshow? ( media-libs/qt-gstreamer || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) 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.10:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.10:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.10:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c839fe31dc9f9b0ceee89a6d460e9938
+_md5_=3a59b4b465c2d2e0647ed118345c9550
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
new file mode 100644
index 000000000000..b99518dfd82e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
+EAPI=5
+HOMEPAGE=http://powarman.dyndns.org/hg/dvbhddevice
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://powarman.dyndns.org/hgwebdir.cgi/dvbhddevice/archive/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vdr-plugin-2	47c67847aaf9886da4f952898e277b6d
+_md5_=09b0ecd1ad79734e4263a18036493da3
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
index 8d0e41e36c95..6ec6567a9db4 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=5
 HOMEPAGE=http://www.xiph.org/paranoia
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-admin/eselect-cdparanoia abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 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	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=093d127892d4991ce0eacc0111002d0d
+_md5_=a90a3e900e0a7749132c02fd4eefc7fc
diff --git a/metadata/md5-cache/media-sound/easytag-2.1.8 b/metadata/md5-cache/media-sound/easytag-2.1.8
index 7a1f25034225..98316b78bc31 100644
--- a/metadata/md5-cache/media-sound/easytag-2.1.8
+++ b/metadata/md5-cache/media-sound/easytag-2.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/easytag/
 IUSE=flac mp3 mp4 nls speex vorbis wavpack
-KEYWORDS=alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.1/easytag-2.1.8.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=50212d9ee23d5be5a57debcea0089372
+_md5_=5c666beead867df0a085296aeb66b60c
diff --git a/metadata/md5-cache/media-sound/easytag-2.1.9 b/metadata/md5-cache/media-sound/easytag-2.1.9
new file mode 100644
index 000000000000..67764802a8e5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easytag-2.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis ) app-text/yelp-tools dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags
+EAPI=5
+HOMEPAGE=http://projects.gnome.org/easytag/
+IUSE=flac mp3 mp4 nls speex vorbis wavpack
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.24:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( media-libs/taglib[mp4] ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis )
+SLOT=0
+SRC_URI=mirror://gnome/sources/easytag/2.1/easytag-2.1.9.tar.xz
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=06edb621d84de8a5417a8252c35d57a0
diff --git a/metadata/md5-cache/media-sound/mpc-0.25 b/metadata/md5-cache/media-sound/mpc-0.25
index 15c0e0eda435..9eeaf2a4d25e 100644
--- a/metadata/md5-cache/media-sound/mpc-0.25
+++ b/metadata/md5-cache/media-sound/mpc-0.25
@@ -4,10 +4,10 @@ DESCRIPTION=A commandline client for Music Player Daemon (media-sound/mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
 IUSE=iconv
-KEYWORDS=amd64 arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpdclient-2.2 iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/mpc/0/mpc-0.25.tar.xz
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d86a4129e4df8b965c826abebdd919df
+_md5_=fecc25514f1040c83c2b1d6dbde6fc5b
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.1-r1 b/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
index 627a4a31c8ad..b15536510e7a 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=5
 HOMEPAGE=http://mpg321.sourceforge.net/
 IUSE=ipv6
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect-mpg123 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321-0.3.1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8d89d9e1b13d5338571cb8ecf4c039ef
+_md5_=f8603e41865a22be5bfb462048c08849
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index 99f2e1626b2f..a05b748dfebe 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Musepack SV8 libraries and utilities
 EAPI=5
 HOMEPAGE=http://www.musepack.net
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-465[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/libreplaygain-465[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r5 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) !media-libs/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
 _eclasses_=cmake-multilib	8339f7796a9fe34e9c2e8d5288e183e8	cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0dae8d1d1f8a6c099445db75ab6cefe9
+_md5_=7508541525f0c3afd7bbb5f15a57a38c
diff --git a/metadata/md5-cache/media-sound/podget-0.6.15 b/metadata/md5-cache/media-sound/podget-0.6.15
index db5a82eaafd1..136b956ec76d 100644
--- a/metadata/md5-cache/media-sound/podget-0.6.15
+++ b/metadata/md5-cache/media-sound/podget-0.6.15
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A simple podcast aggregator written in bash
 EAPI=5
 HOMEPAGE=http://podget.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=sys-apps/grep sys-apps/sed app-text/tofrodos net-misc/wget
 SLOT=0
 SRC_URI=mirror://sourceforge/podget/podget-0.6.15.tar.gz
-_md5_=57a5494d53e492eb9b335b05f48c1e87
+_md5_=5b3a5db4d815047796ea38980ce55e93
diff --git a/metadata/md5-cache/media-sound/pragha-1.1.2.1 b/metadata/md5-cache/media-sound/pragha-1.1.2.1
index af59d95d72a9..df17288e083c 100644
--- a/metadata/md5-cache/media-sound/pragha-1.1.2.1
+++ b/metadata/md5-cache/media-sound/pragha-1.1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight music player (with support for the Xfce desktop enviro
 EAPI=5
 HOMEPAGE=http://pragha.wikispaces.com/ http://github.com/matiasdelellis/pragha
 IUSE=debug +glyr lastfm +playlist
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 >=dev-libs/keybinder-0.2.2:0 dev-libs/libcdio-paranoia media-libs/gst-plugins-base:0.10 >=media-libs/libcddb-1.3.2 >=media-libs/taglib-1.7.1 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.10 playlist? ( >=dev-libs/totem-pl-parser-2.26 ) glyr? ( >=media-libs/glyr-1.0.1 ) lastfm? ( >=media-libs/libclastfm-0.5 ) media-plugins/gst-plugins-meta:0.10
 SLOT=0
 SRC_URI=http://dissonance.googlecode.com/files/pragha-1.1.2.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=6378d3564d2a485429cb10a6d9a92dac
+_md5_=6168c48654a028b20c353580d89e3b50
diff --git a/metadata/md5-cache/media-sound/wavpack-4.60.1-r1 b/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
index 7eb75a061d27..cbf37730996c 100644
--- a/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
+++ b/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=WavPack audio compression tools
 EAPI=5
 HOMEPAGE=http://www.wavpack.com
 IUSE=mmx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.wavpack.com/wavpack-4.60.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=06aa16ac7d198a49a0b052b281e0a951
+_md5_=be29d2c351773c256753dae7f6993684
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.11 b/metadata/md5-cache/media-video/ffmpeg-0.10.11
new file mode 100644
index 000000000000..da8cd9d35eba
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) amr? ( media-libs/opencore-amr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) cdio? ( dev-libs/libcdio-paranoia[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) celt? ( >=media-libs/celt-0.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) dirac? ( media-video/dirac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) encode? ( aac? ( media-libs/vo-aacenc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) aacplus? ( media-libs/libaacplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) amr? ( media-libs/vo-amrwbenc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) faac? ( media-libs/faac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mp3? ( >=media-sound/lame-3.98.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) x264? ( >=media-libs/x264-0.0.20111017:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) xvid? ( >=media-libs/xvid-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) gsm? ( >=media-sound/gsm-1.0.12-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libass? ( media-libs/libass[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libv4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) openal? ( >=media-libs/openal-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) openssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) rtmp? ( >=media-video/rtmpdump-2.2f[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) schroedinger? ( media-libs/schroedinger[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) speex? ( >=media-libs/speex-1.2_beta3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) truetype? ( media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vaapi? ( >=x11-libs/libva-0.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vdpau? ( x11-libs/libvdpau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vpx? ( >=media-libs/libvpx-0.9.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !<media-video/ffmpeg-1.2 !<media-video/libav-9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
+EAPI=5
+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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) amr? ( media-libs/opencore-amr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) cdio? ( dev-libs/libcdio-paranoia[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) celt? ( >=media-libs/celt-0.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) dirac? ( media-video/dirac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) encode? ( aac? ( media-libs/vo-aacenc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) aacplus? ( media-libs/libaacplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) amr? ( media-libs/vo-amrwbenc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) faac? ( media-libs/faac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) mp3? ( >=media-sound/lame-3.98.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) x264? ( >=media-libs/x264-0.0.20111017:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) xvid? ( >=media-libs/xvid-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) gsm? ( >=media-sound/gsm-1.0.12-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libass? ( media-libs/libass[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libv4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) modplug? ( media-libs/libmodplug[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) openal? ( >=media-libs/openal-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) openssl? ( dev-libs/openssl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) rtmp? ( >=media-video/rtmpdump-2.2f[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) schroedinger? ( media-libs/schroedinger[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) speex? ( >=media-libs/speex-1.2_beta3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) truetype? ( media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vaapi? ( >=x11-libs/libva-0.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vdpau? ( x11-libs/libvdpau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) vpx? ( >=media-libs/libvpx-0.9.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !<media-video/ffmpeg-1.2 !<media-video/libav-9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) test? ( encode zlib )
+SLOT=0.10
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.11.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a1cc06d56e5b2e9980560f81d3431406
diff --git a/metadata/md5-cache/media-video/gpac-0.5.0-r1 b/metadata/md5-cache/media-video/gpac-0.5.0-r1
index bec239ea9633..330aed5033ba 100644
--- a/metadata/md5-cache/media-video/gpac-0.5.0-r1
+++ b/metadata/md5-cache/media-video/gpac-0.5.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GPAC is an implementation of the MPEG-4 Systems standard developed f
 EAPI=4
 HOMEPAGE=http://gpac.wp.mines-telecom.fr/
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid
-KEYWORDS=alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) 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 virtual/glu ) >=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 ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) 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.5.0.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=75d454131dad43f533b0f02a136c245e
+_md5_=dbd07ebef06862812d4551e94274cec8
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.65 b/metadata/md5-cache/media-video/mediainfo-0.7.65
index ecac5173fe48..542ce11b3bbc 100644
--- a/metadata/md5-cache/media-video/mediainfo-0.7.65
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.65
@@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=5
 HOMEPAGE=http://mediaarea.net/mediainfo/
 IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.65[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediainfo/mediainfo_0.7.65.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	wxwidgets	755f4b28ecdf7c1213011108e566babc
-_md5_=62fdfd40e52dbe8336136e8bdbf06593
+_md5_=acb385de9f7966b34472d0edbe6ba671
diff --git a/metadata/md5-cache/media-video/parole-0.5.2 b/metadata/md5-cache/media-video/parole-0.5.2
index cf8664ed60e1..56979e73ff90 100644
--- a/metadata/md5-cache/media-video/parole-0.5.2
+++ b/metadata/md5-cache/media-video/parole-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=a simple media player based on the GStreamer framework for the Xfce4
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/parole/
 IUSE=debug libnotify taglib
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/parole/0.5/parole-0.5.2.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=e60be43be61f4780c77e17e0ba39f9ec
+_md5_=952cc057a4b78f64ffe298a195c4df4f
diff --git a/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018 b/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
index 7e651844645e..3aeec31da3bd 100644
--- a/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
+++ b/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
@@ -4,10 +4,10 @@ DESCRIPTION=Open source command-line RTMP client intended to stream audio or vid
 EAPI=4
 HOMEPAGE=http://rtmpdump.mplayerhq.hu/
 IUSE=gnutls polarssl ssl
-KEYWORDS=amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=ssl? ( gnutls? ( net-libs/gnutls ) polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) ) !gnutls? ( !polarssl? ( dev-libs/openssl ) ) ) sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4_p20131018.tar.gz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ebb7d35939963d9f1ffba1d769418d62
+_md5_=a57668ab00f521ed464c824e4a6148bf
diff --git a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2 b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
index ed01e39360e3..a2a30159c808 100644
--- a/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
+++ b/metadata/md5-cache/net-analyzer/ifstat-1.1-r2
@@ -10,4 +10,4 @@ RDEPEND=snmp? ( >=net-analyzer/net-snmp-5.0 )
 SLOT=0
 SRC_URI=http://gael.roualland.free.fr/ifstat/ifstat-1.1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d217aba29f4f90c8edbd4c0e3ab06abb
+_md5_=0ad6bc12d14ae7de7fc40b3dffa41728
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
similarity index 82%
rename from metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4
rename to metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
index 52be3970ec55..5d5674286fa4 100644
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A console-based network monitoring utility
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/iptraf-ng/
 IUSE=doc
-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 doc? ( FDL-1.1 )
 RDEPEND=>=sys-libs/ncurses-5.7-r7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=614d001cdfe03b7353b6ba1248ad13c9
+_md5_=fbe1f271386d1fcc83c632db985b1d7e
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-9999 b/metadata/md5-cache/net-analyzer/iptraf-ng-9999
new file mode 100644
index 000000000000..588ba8529d68
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=sys-libs/ncurses-5.7-r7 virtual/os-headers !net-analyzer/iptraf >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A console-based network monitoring utility
+EAPI=5
+HOMEPAGE=http://fedorahosted.org/iptraf-ng/
+IUSE=doc
+LICENSE=GPL-2 doc? ( FDL-1.1 )
+RDEPEND=>=sys-libs/ncurses-5.7-r7
+RESTRICT=test
+SLOT=0
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a8caf47f438cfeacc6bbf15214b83c89
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 d4279f32982f..7c13af4576d2 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.0
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=virtual/yacc
 DESCRIPTION=Tools for ATM
 HOMEPAGE=http://linux-atm.sourceforge.net/
-KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.0.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=333697b1f227f822436af5c98938dc6d
+_md5_=7af70b10d41b28f0e41fde6d0d00806b
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index f04abddbbb43..0c987b29d393 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for ATM
 EAPI=5
 HOMEPAGE=http://linux-atm.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3e8f28d99b1ad5b9024ef74b8a457785
+_md5_=2f67c62accc51d89519ff5b61723f763
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 74eb479f8f97..299ce0b709b2 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.30-r3
+++ b/metadata/md5-cache/net-dns/avahi-0.6.30-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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-core dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 virtual/pkgconfig doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
+DEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( dev-qt/qtcore: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-core dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 virtual/pkgconfig doc? ( app-doc/doxygen mono? ( >=dev-lang/mono-1.1.8 ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=3
 HOMEPAGE=http://avahi.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-lib
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.30.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63628a6e725816476fe5273020e90f45
+_md5_=542c3800c6b4e3bd97991a07f1ff7f33
diff --git a/metadata/md5-cache/net-dns/bind-9.9.4_p2 b/metadata/md5-cache/net-dns/bind-9.9.4_p2
index c9bc2be00ecc..5c55cd82709d 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.4_p2
+++ b/metadata/md5-cache/net-dns/bind-9.9.4_p2
@@ -4,11 +4,11 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC BSD BSD-2 HPND JNIC openssl
 RDEPEND=ssl? ( dev-libs/openssl:0[-bindist] ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) python? ( virtual/python-argparse ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) )
 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.4-P2/bind-9.9.4-P2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://dev.gentoo.org/~idl0r/bind-9.9.4_p2-geoip.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	db-use	1c719875d6599536f956fafea9e1f404	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	305197b0aa1194fa3ef67ca21f6faa7e	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8c6009c96a038a6427b48beeab466195
+_md5_=09fe082c9bbee09ff4cf77fa8c82f9da
diff --git a/metadata/md5-cache/net-ftp/atftp-0.7-r3 b/metadata/md5-cache/net-ftp/atftp-0.7-r3
index 261bb9226fc2..146936a4334a 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.7-r3
+++ b/metadata/md5-cache/net-ftp/atftp-0.7-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced TFTP implementation client/server
 EAPI=5
 HOMEPAGE=ftp://ftp.mamalinux.com/pub/atftp/
 IUSE=selinux tcpd readline pcre
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~ppc ppc64 ~s390 ~sparc x86
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=122f2693afdf2cb84f5ecd6b5b8b1931
+_md5_=28cbe6edff0ebc11e9007354799f5dcf
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.14 b/metadata/md5-cache/net-ftp/lftp-4.4.14
index d1eb7902ae42..c3878c26d670 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.4.14
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=5
 HOMEPAGE=http://lftp.yar.ru/
 IUSE=convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 )
 REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
 SLOT=0
 SRC_URI=http://lftp.yar.ru/ftp/lftp-4.4.14.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8de734a5b2f3cea7a8b1ff03b88182c5
+_md5_=98b9e6842b8e5adba77b188c6b6e15f5
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.2-r1 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.2-r1
index 6fc884681266..d8246fa62c93 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.2-r1
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
 EAPI=5
 HOMEPAGE=http://gupnp.org
 IUSE=+introspection python python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=net-libs/gssdp >=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.16:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.2.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=33e455d47062c32c4772879aa72af2e0
+_md5_=68b743c6ea8d851e14a9182a67f026b0
diff --git a/metadata/md5-cache/net-libs/libasyncns-0.8-r3 b/metadata/md5-cache/net-libs/libasyncns-0.8-r3
index e4f9a29b48f2..cb99901bae27 100644
--- a/metadata/md5-cache/net-libs/libasyncns-0.8-r3
+++ b/metadata/md5-cache/net-libs/libasyncns-0.8-r3
@@ -4,9 +4,9 @@ DESCRIPTION=C library for executing name service queries asynchronously.
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/libasyncns/
 IUSE=doc debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libasyncns/libasyncns-0.8.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d8b1444dccef0962ff8ef2904a922710
+_md5_=670533105d23db2da372ecc4da12a91b
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.3.2 b/metadata/md5-cache/net-libs/libblkmaker-0.3.2
index 40d127ab077d..34837a81154f 100644
--- a/metadata/md5-cache/net-libs/libblkmaker-0.3.2
+++ b/metadata/md5-cache/net-libs/libblkmaker-0.3.2
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/jansson-2.0.0
 DESCRIPTION=C implementation of getblocktemplate (BIP 22)
 EAPI=5
 HOMEPAGE=https://gitorious.org/bitcoin/libblkmaker
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/jansson-2.0.0 !<net-misc/bfgminer-3.0.3
 SLOT=0
 SRC_URI=https://gitorious.org/bitcoin/libblkmaker/archive/v0.3.2.tar.gz -> libblkmaker-0.3.2.tgz
-_md5_=b6c909e4b292e381a803415f80aa6fa4
+_md5_=fd0663ff695000985f2be82e941c2982
diff --git a/metadata/md5-cache/net-libs/libbluedevil-1.9.4 b/metadata/md5-cache/net-libs/libbluedevil-1.9.4
index 2c1c1430cc4b..47aadb91e77e 100644
--- a/metadata/md5-cache/net-libs/libbluedevil-1.9.4
+++ b/metadata/md5-cache/net-libs/libbluedevil-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Qt wrapper for bluez used in the KDE bluetooth stack
 EAPI=5
 HOMEPAGE=http://projects.kde.org/projects/playground/libs/libbluedevil
 IUSE=debug aqua
-KEYWORDS=~amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-wireless/bluez >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libbluedevil/libbluedevil-v1.9.4.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=af0cf847dde3eb67daa9b082a5dd1fc8
+_md5_=da63ad1ae5f5ccbb53cfe11dd207019b
diff --git a/metadata/md5-cache/net-libs/libkgapi-2.0.2 b/metadata/md5-cache/net-libs/libkgapi-2.0.2
index 95998200e88e..8bc4bdd1696a 100644
--- a/metadata/md5-cache/net-libs/libkgapi-2.0.2
+++ b/metadata/md5-cache/net-libs/libkgapi-2.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library for accessing Google calendar and contact resources
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkgapi
 IUSE=debug aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.11:4[aqua=] dev-libs/qjson >=kde-base/oxygen-icons-4.11:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.11:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libkgapi/2.0.2/src/libkgapi-2.0.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f74d6e6db4b6fc054afb01ca5a4b9a44
+_md5_=48e3042934c42cd7cfc076b65d9c1602
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-3.5.0 b/metadata/md5-cache/net-libs/libkvkontakte-3.5.0
index ac1ae386e7c3..3834a674aca4 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-3.5.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-3.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for accessing the features of social networking site vkontak
 EAPI=4
 HOMEPAGE=http://www.digikam.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.0 >=kde-base/oxygen-icons-4.10:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d801a1e20967492ea627c15beec4fc2f
+_md5_=e45e8150bae0b13ebf4aa2a227b26491
diff --git a/metadata/md5-cache/net-libs/libmbim-1.6.0 b/metadata/md5-cache/net-libs/libmbim-1.6.0
new file mode 100644
index 000000000000..c6623f21a964
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmbim-1.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig
+DESCRIPTION=MBIM modem protocol helper library
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/libmbim/
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.32
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/libmbim/libmbim-1.6.0.tar.xz
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=32ff4ab6fe6727b6246bbd90818a4f5a
diff --git a/metadata/md5-cache/net-libs/libmbim-9999 b/metadata/md5-cache/net-libs/libmbim-9999
new file mode 100644
index 000000000000..1699a75572f2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmbim-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig dev-util/gtk-doc >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=MBIM modem protocol helper library
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/libmbim/
+IUSE=doc static-libs test
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.32
+SLOT=0
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=32671a6e16d08208779ba90c9f95c35a
diff --git a/metadata/md5-cache/net-libs/libmediawiki-3.5.0 b/metadata/md5-cache/net-libs/libmediawiki-3.5.0
index 58de8b8f476a..d57a87c5fad7 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-3.5.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-3.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE C++ interface for MediaWiki based web service as wikipedia.org
 EAPI=4
 HOMEPAGE=http://www.digikam.org/
 IUSE=aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.10:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.10:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-3.5.0.tar.bz2
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cc0d0385d19e4ac07d71d973ce4dc6ae
+_md5_=2c6736cbc9ea95a52d139a35fb236ec7
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.32 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.32
index 88a00b824a9f..d22593eec801 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.32
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.32
@@ -4,9 +4,9 @@ DESCRIPTION=A small C library that makes it easy to run an HTTP server as part o
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl static-libs test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.32.tar.gz
-_md5_=41d998d23ceb7838d339223963929648
+_md5_=deabd860c4828e7b867e9475697972dd
diff --git a/metadata/md5-cache/net-libs/libqmi-1.8.0 b/metadata/md5-cache/net-libs/libqmi-1.8.0
new file mode 100644
index 000000000000..0fee4a645578
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libqmi-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig
+DESCRIPTION=QMI modem protocol helper library
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/libqmi/
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.32
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/libqmi/libqmi-1.8.0.tar.xz
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=a5bd3a06a376710d8ae743e4669b9973
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index ed822df2d865..3c1193e12833 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig dev-util/gtk-doc dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig dev-util/gtk-doc >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=QMI modem protocol helper library
-EAPI=4
+EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/libqmi/
 IUSE=doc static-libs test
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ded14f42dbb4cc1d208ef7eb0ed929ca
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=eec8d4d4b6ca064ce5e9472b389e9d5a
diff --git a/metadata/md5-cache/net-libs/neon-0.30.0 b/metadata/md5-cache/net-libs/neon-0.30.0
index 348b2038df9f..4ca95732446b 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.0
+++ b/metadata/md5-cache/net-libs/neon-0.30.0
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP and WebDAV client library
 EAPI=5
 HOMEPAGE=http://www.webdav.org/neon/
 IUSE=doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib linguas_cs linguas_de linguas_fr linguas_ja linguas_nn linguas_pl linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=expat? ( dev-libs/expat:0= ) !expat? ( dev-libs/libxml2:2= ) gnutls? ( app-misc/ca-certificates net-libs/gnutls:0= pkcs11? ( dev-libs/pakchois:0= ) ) !gnutls? ( ssl? ( dev-libs/openssl:0= pkcs11? ( dev-libs/pakchois:0= ) ) ) kerberos? ( virtual/krb5:0= ) libproxy? ( net-libs/libproxy:0= ) nls? ( virtual/libintl:0= ) zlib? ( sys-libs/zlib:0= )
 RESTRICT=test
 SLOT=0/27
 SRC_URI=http://www.webdav.org/neon/neon-0.30.0.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ae5b3c5667e24c87da9e02dfcb2fd131
+_md5_=4ffc6213093ec70092a51c0dc30ce927
diff --git a/metadata/md5-cache/net-misc/bfgminer-3.5.6 b/metadata/md5-cache/net-misc/bfgminer-3.5.6
index b15cfb23ede5..38777f0b7cee 100644
--- a/metadata/md5-cache/net-misc/bfgminer-3.5.6
+++ b/metadata/md5-cache/net-misc/bfgminer-3.5.6
@@ -4,11 +4,11 @@ DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
 EAPI=4
 HOMEPAGE=https://bitcointalk.org/?topic=168174
 IUSE=+adl avalon bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster icarus littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt +udev unicode x6500 ztex
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses[unicode?] ) >=dev-libs/jansson-2 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) lm_sensors? ( sys-apps/lm_sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) x6500? ( virtual/libusb:1 ) ztex? ( virtual/libusb:1 ) opencl? ( virtual/opencl )
 REQUIRED_USE=|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex ) adl? ( opencl ) bfsb? ( bitfury ) bigpic? ( bitfury ) hashbuster? ( bitfury ) littlefury? ( bitfury ) lm_sensors? ( opencl ) metabank? ( bitfury ) nanofury? ( bitfury ) scrypt? ( || ( cpumining opencl ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy )
 SLOT=0
 SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/3.5.6/bfgminer-3.5.6.tbz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c6e243370fe122b48503bfbdf71894b5
+_md5_=6870f7762a2e71bcafefd1f1a5663e9c
diff --git a/metadata/md5-cache/net-misc/connman-1.19 b/metadata/md5-cache/net-misc/connman-1.19
index 25a6fc60e165..3178727e2776 100644
--- a/metadata/md5-cache/net-misc/connman-1.19
+++ b/metadata/md5-cache/net-misc/connman-1.19
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=5
 HOMEPAGE=http://connman.net
 IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit tools vpnc +wifi
-KEYWORDS=amd64 arm ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.19.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4409e161e6ead2c37957f0ff468c139f
+_md5_=005120eb6c7bf8a6297243ab7533db53
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.17 b/metadata/md5-cache/net-misc/memcached-1.4.17
index cb4c5eeffcbc..68fc2d352828 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.17
+++ b/metadata/md5-cache/net-misc/memcached-1.4.17
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=test slabs-reassign debug sasl
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.memcached.org/files/memcached-1.4.17.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=59284c656ed0bb61bca2a7fcf7635915
+_md5_=2fedd70f7fa6d26262c8931219a279a1
diff --git a/metadata/md5-cache/net-misc/netifrc-0.1 b/metadata/md5-cache/net-misc/netifrc-0.1
index eb2375b8e55f..28cba9c137c5 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=>=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/netifrc-0.1.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8b1fb5fc6c583bc046ed88d9ddfacefa
+_md5_=53c18dcbca9f934989da3cacbddfabff
diff --git a/metadata/md5-cache/net-misc/putty-0.63 b/metadata/md5-cache/net-misc/putty-0.63
deleted file mode 100644
index d5859f56f89a..000000000000
--- a/metadata/md5-cache/net-misc/putty-0.63
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango dev-lang/perl virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
-DESCRIPTION=A Free Telnet/SSH Client
-EAPI=5
-HOMEPAGE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
-IUSE=doc ipv6 kerberos
-KEYWORDS=alpha amd64 hppa ppc sparc x86
-LICENSE=MIT
-RDEPEND=!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=http://the.earth.li/~sgtatham/putty/latest/putty-0.63.tar.gz http://dev.gentoo.org/~jer/putty-icons.tar.bz2
-_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b3faa8759eeb1e76845ef85b9bc19b9d
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.1 b/metadata/md5-cache/net-misc/rdesktop-1.8.1
index 4b2b93a59be9..27a55e222064 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=5
 HOMEPAGE=http://rdesktop.sourceforge.net/
 IUSE=alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( net-libs/libgssglue ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdesktop/rdesktop-1.8.1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fbe184111d9e36bd1f9542c2b3921cbd
+_md5_=e0bc442db7a9211d873e0953a78f50db
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.10.09 b/metadata/md5-cache/net-misc/youtube-dl-2013.10.09
deleted file mode 100644
index d17c344cbddd..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.10.09
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-DESCRIPTION=Download videos from YouTube.com (and mores sites...)
-EAPI=5
-HOMEPAGE=http://rg3.github.com/youtube-dl/
-IUSE=offensive test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2013.10.09/youtube-dl-2013.10.09.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7ad086283b49d80790cb87ad73cd3d0f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.12.20 b/metadata/md5-cache/net-misc/youtube-dl-2013.12.20
index 6f6e10b548d6..ea5bf3b480e0 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.12.20
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.12.20
@@ -4,11 +4,11 @@ DESCRIPTION=Download videos from YouTube.com (and mores sites...)
 EAPI=5
 HOMEPAGE=http://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3 )
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2013.12.20/youtube-dl-2013.12.20.tar.gz
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5f558de5e5358f0f7c73adecef7e8d9c
+_md5_=9f595588bee0cd226d9c536ee674c4a5
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.12.26 b/metadata/md5-cache/net-misc/youtube-dl-2013.12.26
deleted file mode 100644
index 48a8bea3dfa3..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.12.26
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-DESCRIPTION=Download videos from YouTube.com (and mores sites...)
-EAPI=5
-HOMEPAGE=http://rg3.github.com/youtube-dl/
-IUSE=offensive test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
-REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2013.12.26/youtube-dl-2013.12.26.tar.gz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=83fc97f16cece7e7bf56f71fd2a6582f
diff --git a/metadata/md5-cache/net-print/hplip-3.14.1 b/metadata/md5-cache/net-print/hplip-3.14.1
index 375f636c8bb9..98c3da63c147 100644
--- a/metadata/md5-cache/net-print/hplip-3.14.1
+++ b/metadata/md5-cache/net-print/hplip-3.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax driver
 EAPI=5
 HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
 IUSE=doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg hpijs? ( || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] ) ) !minimal? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads,xml] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=virtual/python-imaging-1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ) )
 REQUIRED_USE=!minimal? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.14.1.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.13.11-patches-1.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=74604fcd39f091599b499ed8cef6249d
+_md5_=df9accd6adaa2d53c0ba4ee10c3298a8
diff --git a/metadata/md5-cache/net-wireless/b43-fwcutter-018 b/metadata/md5-cache/net-wireless/b43-fwcutter-018
index f80a841a5cef..0b0179137d82 100644
--- a/metadata/md5-cache/net-wireless/b43-fwcutter-018
+++ b/metadata/md5-cache/net-wireless/b43-fwcutter-018
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst
 DESCRIPTION=Firmware Tool for Broadcom 43xx based wireless network devices using the mac80211 wireless stack
 HOMEPAGE=http://bues.ch/b43/fwcutter
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://bues.ch/b43/fwcutter/b43-fwcutter-018.tar.bz2
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1458da1bd8aa1480265d248fd2dea68c
+_md5_=343d19de61347f5a939142340f7d481a
diff --git a/metadata/md5-cache/net-wireless/bluedevil-1.3.2 b/metadata/md5-cache/net-wireless/bluedevil-1.3.2
index c042bd7aedc7..490ce7681646 100644
--- a/metadata/md5-cache/net-wireless/bluedevil-1.3.2
+++ b/metadata/md5-cache/net-wireless/bluedevil-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=http://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug linguas_ar linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mai linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=net-libs/libbluedevil-1.9.3 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_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_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) 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_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) 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 >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/bluedevil/bluedevil-v1.3.2.tar.xz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b0e22fd423b761b1e73dd2e2c6a63bfb
+_md5_=a61b2adf83e02e54b972cac200bcbb95
diff --git a/metadata/md5-cache/net-wireless/bluez-4.101-r8 b/metadata/md5-cache/net-wireless/bluez-4.101-r8
index 1d0f5f64d3c2..550884ce5208 100644
--- a/metadata/md5-cache/net-wireless/bluez-4.101-r8
+++ b/metadata/md5-cache/net-wireless/bluez-4.101-r8
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=5
 HOMEPAGE=http://www.bluez.org/
 IUSE=alsa cups debug gstreamer hid2hci pcmcia readline selinux test-programs usb python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 arm hppa ppc ~ppc64 x86
+KEYWORDS=amd64 arm hppa ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 >=virtual/udev-171 alsa? ( media-libs/alsa-lib:=[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)] media-libs/libsndfile:= ) cups? ( net-print/cups:= ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) readline? ( sys-libs/readline:= ) selinux? ( sec-policy/selinux-bluetooth ) usb? ( virtual/libusb:0 ) test-programs? ( >=dev-python/dbus-python-1 dev-python/pygobject:2 dev-python/pygobject:3 python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=test-programs? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.101.tar.xz http://dev.gentoo.org/~pacho/bluez/bluez-4.101-patches.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b28abd8dacb073f5c837924b1f5f09d9
+_md5_=810382885b0733211c53cf43a25a46df
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-2.120.921 b/metadata/md5-cache/perl-core/CPAN-Meta-2.120.921
index d545ed3ceee2..fed5a7deea67 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-2.120.921
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-2.120.921
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YA
 DESCRIPTION=The distribution metadata for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 >=virtual/perl-Parse-CPAN-Meta-1.440.300 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.82 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.120921.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=171b3abfdacfba2fb3a0cb41a84bf9c9
+_md5_=c56072db81c24c27bf6c51a624ddce63
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-2.132.140 b/metadata/md5-cache/perl-core/CPAN-Meta-2.132.140
index aba543585e92..64db48726715 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-2.132.140
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-2.132.140
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YA
 DESCRIPTION=The distribution metadata for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 >=virtual/perl-Parse-CPAN-Meta-1.440.300 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.82 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.132140.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9cec9a86d7d1836894d5d2b3753c8b4e
+_md5_=7a3729773cbfa5d1dd6c4bb05d98f7f1
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-2.132.510 b/metadata/md5-cache/perl-core/CPAN-Meta-2.132.510
index cb7fc5cfb3fe..8230bc730ed4 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-2.132.510
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-2.132.510
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YA
 DESCRIPTION=The distribution metadata for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 >=virtual/perl-Parse-CPAN-Meta-1.440.300 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.82 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.132510.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1470a1bf3c5fc4c4cb5d09833b01d925
+_md5_=9ea48bebf8285da8ffb6bedc281b1659
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.122.0 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.122.0
index 796bf0bfdb00..2c9bb317f685 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.122.0
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.122.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CP
 DESCRIPTION=A set of version requirements for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta-Requirements/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=45647b6ceb20c47c67794854d4329123
+_md5_=1647ed4ea72850b8b03353c25ad064cd
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.123.0 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.123.0
index 6533747c7652..1a38ce75c64e 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.123.0
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.123.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CP
 DESCRIPTION=A set of version requirements for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta-Requirements/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.123.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3afac68703bced50b476573f32946319
+_md5_=68eebb03486846221f2f1831a8a87759
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0
index 352748c54e70..f25050637ab6 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CP
 DESCRIPTION=A set of version requirements for a CPAN dist
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta-Requirements/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=847ae85239abfc664df704c58f122f1e
+_md5_=c54c07107582e0be22ae3db67c456bc0
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-YAML-0.8.0 b/metadata/md5-cache/perl-core/CPAN-Meta-YAML-0.8.0
index 83efa8af0db2..458feff46cae 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-YAML-0.8.0
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-YAML-0.8.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Read and write a subset of YAML for CPAN Meta files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta-YAML/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.008.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5d7562e39bbabcea939a87cb7c20fa14
+_md5_=98bf112f0b26375b15453d6b0798e075
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0 b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0
index 88c5933c37c8..1257a62ca2f3 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Generate XS code to import C header constants
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Constant/
-KEYWORDS=~amd64 hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6c6c9c5f9d70780370176377187929df
+_md5_=0977acc95f200ebf55e824618a04e3a4
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Install-1.540.0 b/metadata/md5-cache/perl-core/ExtUtils-Install-1.540.0
index 6407c5a8362a..9060cd63bd11 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Install-1.540.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Install-1.540.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Install files from here to there
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Install/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/ExtUtils-Install-1.54.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3dd3b947e1c0c51b9045d401ec03e349
+_md5_=6eb45c118f8e42b848c406e31d730d0a
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.640.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.640.0
index 146af63a8132..d3ed74ae0206 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.640.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.640.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1
 DESCRIPTION=Create a module Makefile
 EAPI=4
 HOMEPAGE=http://makemaker.org http://search.cpan.org/dist/ExtUtils-MakeMaker/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 PDEPEND=>=virtual/perl-CPAN-Meta-2.112.621 >=virtual/perl-Parse-CPAN-Meta-1.440.100
 RDEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1.540.0 >=virtual/perl-ExtUtils-Manifest-1.600.0 >=virtual/perl-File-Spec-0.800.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.64.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=83ec007ffa18516059a6a534d714d36a
+_md5_=a2be9868da98067c4710d888588219f4
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.720.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.720.0
index 1682682e57c6..60e8ced22bc1 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.720.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.720.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1
 DESCRIPTION=Create a module Makefile
 EAPI=4
 HOMEPAGE=http://makemaker.org http://search.cpan.org/dist/ExtUtils-MakeMaker/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 PDEPEND=>=virtual/perl-CPAN-Meta-2.112.621 >=virtual/perl-Parse-CPAN-Meta-1.440.100
 RDEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1.540.0 >=virtual/perl-ExtUtils-Manifest-1.600.0 >=virtual/perl-File-Spec-0.800.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.72.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6a1e1a895545c6412545f9ad31e274ee
+_md5_=99d7cf46bb37e5b605f0265f2000888b
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.740.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.740.0
index 086e7ac88f30..edeb0accb0c2 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.740.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.740.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1
 DESCRIPTION=Create a module Makefile
 EAPI=4
 HOMEPAGE=http://makemaker.org http://search.cpan.org/dist/ExtUtils-MakeMaker/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 PDEPEND=>=virtual/perl-CPAN-Meta-2.112.621 >=virtual/perl-Parse-CPAN-Meta-1.440.100
 RDEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1.540.0 >=virtual/perl-ExtUtils-Manifest-1.600.0 >=virtual/perl-File-Spec-0.800.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.74.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=74ca63aa99ca98a0ec2b6a03f9072f1d
+_md5_=3ab5856aff620a2026ef15542e023371
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.820.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.820.0
index 223377d62d68..70bb5a7761b9 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.820.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-6.820.0
@@ -3,11 +3,11 @@ DEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1
 DESCRIPTION=Create a module Makefile
 EAPI=4
 HOMEPAGE=http://makemaker.org http://search.cpan.org/dist/ExtUtils-MakeMaker/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 PDEPEND=>=virtual/perl-CPAN-Meta-2.112.621 >=virtual/perl-Parse-CPAN-Meta-1.440.100
 RDEPEND=>=virtual/perl-ExtUtils-Command-1.160.0 >=virtual/perl-ExtUtils-Install-1.540.0 >=virtual/perl-ExtUtils-Manifest-1.600.0 >=virtual/perl-File-Spec-0.800.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.82.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5c2b5a1f4c94e0df66eec5ad6912d89c
+_md5_=8f03af42fe22a408dbb21a460aeff966
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.610.0 b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.610.0
index e711bc73d198..821000269ff4 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.610.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.610.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Utilities to write and check a MANIFEST file
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Manifest/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/ExtUtils-Manifest-1.61.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=af10a849281450dd75f8931be005c25a
+_md5_=7c69f97b7d6333d90ca948649aa74d44
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.630.0 b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.630.0
index e6768928d0ca..576fd383331e 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.630.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.630.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Utilities to write and check a MANIFEST file
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Manifest/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/ExtUtils-Manifest-1.63.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f19e0378eebad45ab35077953fd2f18f
+_md5_=9829ad0437acd5a90692b8b792761498
diff --git a/metadata/md5-cache/perl-core/File-Spec-3.400.0 b/metadata/md5-cache/perl-core/File-Spec-3.400.0
index 02cddf41b31b..47ef33fb3966 100644
--- a/metadata/md5-cache/perl-core/File-Spec-3.400.0
+++ b/metadata/md5-cache/perl-core/File-Spec-3.400.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Handling files and directories portably
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/PathTools/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.40.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d23faecd72092a4157714f948d5e04da
+_md5_=4c112f14f0876721a6d794943696c04a
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.220.0 b/metadata/md5-cache/perl-core/File-Temp-0.220.0
index cddfb498934d..08a22c1a9ded 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.220.0
+++ b/metadata/md5-cache/perl-core/File-Temp-0.220.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way.
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.22.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6c5a2ec4d9b287ed96bf7d8c83ada428
+_md5_=5f7a9a916be2636e57a7e9d1431345f0
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.100 b/metadata/md5-cache/perl-core/File-Temp-0.230.100
index cab5074a1886..2b47aa47de11 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.100
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.100
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way.
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2301.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0f465a1884ad7d9fc37e721eed36c7cc
+_md5_=ad288c86f2a1b849126eb189b8eb4900
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.400 b/metadata/md5-cache/perl-core/File-Temp-0.230.400
index a7433df47541..0e95e0c68262 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.400
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.400
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way.
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2304.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0c730d5b24f9907c5a38fa883c9d0a3e
+_md5_=88100980c59c2eac1414b2137c52b875
diff --git a/metadata/md5-cache/perl-core/IO-1.25 b/metadata/md5-cache/perl-core/IO-1.25
index 33f032331321..fc8576b88738 100644
--- a/metadata/md5-cache/perl-core/IO-1.25
+++ b/metadata/md5-cache/perl-core/IO-1.25
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=load various IO modules
 EAPI=2
 HOMEPAGE=http://search.cpan.org/dist/IO/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/IO-1.25.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9834c44a06951c7c347061a8047e1e76
+_md5_=c4510e5dc90ddaaf161d5884f6d9927d
diff --git a/metadata/md5-cache/perl-core/JSON-PP-2.272.0 b/metadata/md5-cache/perl-core/JSON-PP-2.272.0
index 36bad4158ca1..18cafe92d64f 100644
--- a/metadata/md5-cache/perl-core/JSON-PP-2.272.0
+++ b/metadata/md5-cache/perl-core/JSON-PP-2.272.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=JSON::XS compatible pure-Perl module
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/JSON-PP/
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!!<dev-perl/JSON-2.50 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5644484af9062a8ef3df6b5a6e46b472
+_md5_=4df2d37ee6d1bff88d96143a78661c3b
diff --git a/metadata/md5-cache/perl-core/JSON-PP-2.272.20 b/metadata/md5-cache/perl-core/JSON-PP-2.272.20
index 47aee7d02dc7..456201fe2abc 100644
--- a/metadata/md5-cache/perl-core/JSON-PP-2.272.20
+++ b/metadata/md5-cache/perl-core/JSON-PP-2.272.20
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=JSON::XS compatible pure-Perl module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/JSON-PP/
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!!<dev-perl/JSON-2.50 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27202.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4189fc9b92fed47f6ad2a7deeb023c74
+_md5_=5c67a4bf081a26a929e2f51151c03032
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400
index 986e956dc913..b11d9077baa3 100644
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400
+++ b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.400
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >
 DESCRIPTION=Parse META.yml and other similar CPAN metadata files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4404.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fe7d026634dbdfe7d038c33f237b07e8
+_md5_=93e61c8b538dc53efa4c1901448cfc96
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.500 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.500
index 6321e1a1b21a..5bbd01192f0c 100644
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.500
+++ b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.500
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >
 DESCRIPTION=Parse META.yml and other similar CPAN metadata files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4405.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6ac0871d73eec1789fdccbe51f3622f6
+_md5_=695f22b10bdf49b59c766268900e9eaa
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.700 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.700
index e3ee518af078..71aa2cd12d20 100644
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.700
+++ b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.700
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >
 DESCRIPTION=Parse META.yml and other similar CPAN metadata files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4407.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5c5766dcfc0f35dc9be357fc04e56b08
+_md5_=7f1121b6b12342fd69a2fa2f8733ddd4
diff --git a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900 b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900
index e01c35c91e01..b212cf6c5893 100644
--- a/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900
+++ b/metadata/md5-cache/perl-core/Parse-CPAN-Meta-1.440.900
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >
 DESCRIPTION=Parse META.yml and other similar CPAN metadata files
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Parse-CPAN-Meta/
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-CPAN-Meta-YAML-0.8.0 >=virtual/perl-JSON-PP-2.272.0 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4409.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6e405cb1e8269a17b557be2e56a58a5f
+_md5_=d948ac65e09c5994a7cc66164877fb56
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
index 7cc106ed8c37..ce347c96c636 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.270.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.27.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5393cc911ee9abc72756f0ebfce28aaf
+_md5_=0bb31c7526c341ba0ccf0737e57783e1
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.300.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.300.0
index 6ca6385ea2c0..211a4279d649 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.300.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.300.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.30.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=02d2dfb0c5f84095d2022f221f75475e
+_md5_=6f0f8ac36adc0d134655bad500684e14
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.310.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.310.0
index 2d196e8cdb10..a71f5b40be1a 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.310.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.310.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.31.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a8d1085de615cc65c0153d9ef159c761
+_md5_=67e49182ef76a5aa1cab664c0a57b90f
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.320.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.320.0
index 324d49aa65a2..08c9c78835d2 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.320.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.320.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.32.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1865788ab917def37232d05a1f71ede3
+_md5_=0de3ede861ee2c65e15be6e4a9a67dfd
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.350.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.350.0
index 6d052926919d..d5270b121107 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.350.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.350.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.35.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ce29a5c4e4c324154ec4cccdc64914d0
+_md5_=6a7cdbe2d03589628a812adc12a5378c
diff --git a/metadata/md5-cache/perl-core/Socket-2.9.0 b/metadata/md5-cache/perl-core/Socket-2.9.0
index 701d763b288f..45c7505d9b73 100644
--- a/metadata/md5-cache/perl-core/Socket-2.9.0
+++ b/metadata/md5-cache/perl-core/Socket-2.9.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-Constant-0.230.0 d
 DESCRIPTION=Networking constants and support functions
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Socket/
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.009.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c3649f8eeca35e1ae927930735cdf522
+_md5_=b1cc8446e2a1fdf0c1de93b5630cb0d0
diff --git a/metadata/md5-cache/perl-core/Test-Simple-0.980.0 b/metadata/md5-cache/perl-core/Test-Simple-0.980.0
index 650e21ad9ee5..ba2d3fa9414a 100644
--- a/metadata/md5-cache/perl-core/Test-Simple-0.980.0
+++ b/metadata/md5-cache/perl-core/Test-Simple-0.980.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Basic utilities for writing tests
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/Test-Simple/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.98.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cfe9ec74b2210647b2745162e8ed0216
+_md5_=6428abd7f7df57d5e0e65eb870b53a46
diff --git a/metadata/md5-cache/perl-core/Test-Simple-0.980.5 b/metadata/md5-cache/perl-core/Test-Simple-0.980.5
index 1c53bbd2da2e..61ae24e8511b 100644
--- a/metadata/md5-cache/perl-core/Test-Simple-0.980.5
+++ b/metadata/md5-cache/perl-core/Test-Simple-0.980.5
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Basic utilities for writing tests
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/Test-Simple/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Simple-0.98_05.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5b86f42cbd7c88d9c999c5d8f134daca
+_md5_=13f4dbd57bbcebaa20eabac7f35a28f6
diff --git a/metadata/md5-cache/perl-core/version-0.990.100 b/metadata/md5-cache/perl-core/version-0.990.100
index 2b32bed9b21c..45c0b4ba8e8d 100644
--- a/metadata/md5-cache/perl-core/version-0.990.100
+++ b/metadata/md5-cache/perl-core/version-0.990.100
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Perl extension for Version Objects
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/version/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9901.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e769749460e895b6c2537e9154e26085
+_md5_=fce008c2677b6681912fe5ea1d99bbcc
diff --git a/metadata/md5-cache/perl-core/version-0.990.200 b/metadata/md5-cache/perl-core/version-0.990.200
index e33c2bb60590..d44f8bc30962 100644
--- a/metadata/md5-cache/perl-core/version-0.990.200
+++ b/metadata/md5-cache/perl-core/version-0.990.200
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl extension for Version Objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/version/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9902.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7ef5e04aa095fecdfcfbe88184b08620
+_md5_=c2f009495a13f5513c20feed2eaa7c31
diff --git a/metadata/md5-cache/perl-core/version-0.990.300 b/metadata/md5-cache/perl-core/version-0.990.300
index 5ddb8bba5021..aa4377d73e4c 100644
--- a/metadata/md5-cache/perl-core/version-0.990.300
+++ b/metadata/md5-cache/perl-core/version-0.990.300
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl extension for Version Objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/version/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9903.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=531b34bd058d9930a582997fab35b04d
+_md5_=e4f6077fbee9c2f65ecd9e94945fed66
diff --git a/metadata/md5-cache/perl-core/version-0.990.400 b/metadata/md5-cache/perl-core/version-0.990.400
index 6c0faf322f1d..de43e7aa9b67 100644
--- a/metadata/md5-cache/perl-core/version-0.990.400
+++ b/metadata/md5-cache/perl-core/version-0.990.400
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl extension for Version Objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/version/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9904.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2185604ae90bc33e56bc82fd7bb7aa80
+_md5_=09b15f62bd9a454379e7e856449ff6d6
diff --git a/metadata/md5-cache/sci-biology/clustalw-1.83-r3 b/metadata/md5-cache/sci-biology/clustalw-1.83-r3
index ea0e82ae8cc5..360a28bc9c22 100644
--- a/metadata/md5-cache/sci-biology/clustalw-1.83-r3
+++ b/metadata/md5-cache/sci-biology/clustalw-1.83-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=General purpose multiple alignment program for DNA and proteins
 EAPI=5
 HOMEPAGE=http://www.embl-heidelberg.de/~seqanal/
-KEYWORDS=alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=clustalw
 SLOT=1
 SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/unix/clustalw/clustalw1.83.UNIX.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d058010fcd418645578c2703fe8f7f7a
+_md5_=aa5b8021f5544f828fca73253e748fd5
diff --git a/metadata/md5-cache/sci-biology/flower-0.7-r1 b/metadata/md5-cache/sci-biology/flower-0.7-r1
index a6bc5d456d40..f6567e5f1350 100644
--- a/metadata/md5-cache/sci-biology/flower-0.7-r1
+++ b/metadata/md5-cache/sci-biology/flower-0.7-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/flower/0.7/flower-0.7.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d59c3fcbf245e9ae3797d3b8c6d09cae
diff --git a/metadata/md5-cache/sci-biology/flower-0.7.2 b/metadata/md5-cache/sci-biology/flower-0.7.2
index a94f31b7bc1e..50dd06403ee1 100644
--- a/metadata/md5-cache/sci-biology/flower-0.7.2
+++ b/metadata/md5-cache/sci-biology/flower-0.7.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/flower/0.7.2/flower-0.7.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d582ec36907d36dfa9c38daae1377b43
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6.5 b/metadata/md5-cache/sci-chemistry/gromacs-4.6.5
index 5892a25a05b2..ea5b9a9b5e71 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.6.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-4.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=5
 HOMEPAGE=http://www.gromacs.org/
 IUSE=X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmm openmp +single-precision test +threads zsh-completion sse2 sse4_1 avx128fma avx256
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) openmm? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 sci-libs/openmm[cuda,opencl] )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) openmm? ( single-precision ) mkl? ( !blas !fftw !lapack )
 SLOT=0/4.6.5
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-4.6.5.pdf -> gromacs-manual-4.6.5.pdf ) test? ( http://gromacs.googlecode.com/files/regressiontests-4.6.5.tar.gz )
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	cuda	9be39ddb95b9b07ec931f30628d40757	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9dc9defb0a00085425d2eb8a5b7b6e32
+_md5_=2803b6a691432c6dbe3bce851ce25932
diff --git a/metadata/md5-cache/sci-libs/alglib-3.7.0 b/metadata/md5-cache/sci-libs/alglib-3.7.0
index 4fc9b4149acb..5b2d0589b583 100644
--- a/metadata/md5-cache/sci-libs/alglib-3.7.0
+++ b/metadata/md5-cache/sci-libs/alglib-3.7.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutil
 DESCRIPTION=Numerical analysis and data processing library
 EAPI=5
 HOMEPAGE=http://www.alglib.net/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.alglib.net/translator/re/alglib-3.7.0.cpp.tgz
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4546cb208279d2fa5948a20765bc4b2e
+_md5_=84ed52ce40522e90a0c6b31b4efd695f
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.2.6-r1 b/metadata/md5-cache/sci-mathematics/agda-2.2.6-r1
index 1dc97e2f7486..7f70989690bc 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.2.6-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.2.6-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/emacs app-emacs/haskell-mode
 SLOT=0
 SRC_URI=http://code.haskell.org/Agda/Agda-2.2.6.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=62d9bb00ec917edd3ed5e144be209f39
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.0.1 b/metadata/md5-cache/sci-mathematics/agda-2.3.0.1
index a8508109bec6..fd7f2a9eed96 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.0.1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.0.1
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4[profile?] <dev-haskell/binary-0.6[profile?] epic? ( dev-lang/epic[profile?] ) =dev-haskell/hashable-1.1*[profile?] =dev-haskell/hashtables-1.0*[profile?] >=dev-haskell/haskeline-0.6.3.2[profile?] <dev-haskell/haskeline-0.7[profile?] >=dev-haskell/haskell-src-exts-1.9.6[profile?] <dev-haskell/haskell-src-exts-1.14[profile?] >=dev-haskell/mtl-2.0[profile?] <dev-haskell/mtl-2.2[profile?] =dev-haskell/quickcheck-2.4*[profile?] >=dev-haskell/syb-0.1[profile?] <dev-haskell/syb-0.4[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-haskell/zlib-0.4.0.1[profile?] <dev-haskell/zlib-0.6[profile?] >=dev-lang/ghc-6.10.4 virtual/emacs app-emacs/haskell-mode
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.0.1/Agda-2.3.0.1.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=a6f16a925d4bb60326e9a1e9628dd51d
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.0.1-r1 b/metadata/md5-cache/sci-mathematics/agda-2.3.0.1-r1
index 6acdb7f8bb31..37ee40306383 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.0.1-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.0.1-r1
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.6:=[profile?] epic? ( dev-lang/epic:=[profile?] ) =dev-haskell/hashable-1.1*:=[profile?] =dev-haskell/hashtables-1.0*:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.7:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.14:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.6:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.4:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.10.4:= virtual/emacs app-emacs/haskell-mode
 SLOT=0/2.3.0.1
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.0.1/Agda-2.3.0.1.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dcf0e0617924864d69f269466312cdd6
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.2 b/metadata/md5-cache/sci-mathematics/agda-2.3.2
index 5b06ca027f0c..6a658d46388e 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.2
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.6:=[profile?] =dev-haskell/deepseq-1.3*:=[profile?] epic? ( dev-lang/epic:=[profile?] ) >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.2:=[profile?] =dev-haskell/hashtables-1.0*:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.14:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.6:=[profile?] =dev-haskell/text-0.11*:=[profile?] =dev-haskell/unordered-containers-0.2*:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/emacs app-emacs/haskell-mode
 SLOT=0/2.3.2
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.2/Agda-2.3.2.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9f8a015605482d1f223dad4dbda1705d
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.2-r2 b/metadata/md5-cache/sci-mathematics/agda-2.3.2-r2
index 3c51da9fa34c..379cd842bab7 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.2-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.2-r2
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.7:=[profile?] =dev-haskell/deepseq-1.3*:=[profile?] epic? ( dev-lang/epic:=[profile?] ) >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] =dev-haskell/hashtables-1.0*:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.14:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.6:=[profile?] =dev-haskell/text-0.11*:=[profile?] =dev-haskell/unordered-containers-0.2*:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/emacs app-emacs/haskell-mode
 SLOT=0/2.3.2
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.2/Agda-2.3.2.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=8471aeef5e7fc220cd69bfab7c1a220f
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.2-r5 b/metadata/md5-cache/sci-mathematics/agda-2.3.2-r5
index 0791020dcb07..7e46ea70a608 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.2-r5
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.2-r5
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] =dev-haskell/deepseq-1.3*:=[profile?] epic? ( dev-lang/epic:=[profile?] ) >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hashtables-1.0:=[profile?] <dev-haskell/hashtables-1.2:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.14:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?] =dev-haskell/text-0.11*:=[profile?] =dev-haskell/unordered-containers-0.2*:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/emacs app-emacs/haskell-mode
 SLOT=0/2.3.2
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.2/Agda-2.3.2.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b4eb350bda7bb7e5101c3f002a5bae09
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.2.1-r1 b/metadata/md5-cache/sci-mathematics/agda-2.3.2.1-r1
index 0d7af55a56f9..fb9813d65427 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.2.1-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] =dev-haskell/deepseq-1.3*:=[profile?] >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/hashtables-1.0:=[profile?] <dev-haskell/hashtables-1.2:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] =dev-haskell/unordered-containers-0.2*:=[profile?] =dev-haskell/xhtml-3000.2*:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.12.1:= virtual/emacs app-emacs/haskell-mode epic? ( <dev-lang/epic-0.10:=[profile?] >=dev-lang/epic-0.1.13:=[profile?] ) || ( >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] )
 SLOT=0/2.3.2.1
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.2.1/Agda-2.3.2.1.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=3506c69509edac50869adc53f72bf1ca
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.3.2.2-r1 b/metadata/md5-cache/sci-mathematics/agda-2.3.2.2-r1
index e42ca5fe4245..e73d45c7f3ca 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.3.2.2-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.3.2.2-r1
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( sci-mathematics/agda-stdlib )
 RDEPEND=>=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/deepseq-1.3:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] >=dev-haskell/hashtables-1.0:=[profile?] <dev-haskell/hashtables-1.2:=[profile?] >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-6.12.1:= epic? ( >=dev-lang/epic-0.1.13:=[profile?] <dev-lang/epic-0.10:=[profile?] ) || ( ( >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.1:=[profile?] ) ( >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] ) ) || ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) ( >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
 SLOT=0/2.3.2.2
 SRC_URI=mirror://hackage/packages/archive/Agda/2.3.2.2/Agda-2.3.2.2.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=be1af7744233ad3b4662594b796ea60e
diff --git a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1 b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1
index dd26d1a76b9b..72fc00966a45 100644
--- a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1
+++ b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Agda-executable/2.3.0.1/Agda-executable-2.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1d94a3d7bb1416e81dcf6f13faac27cb
diff --git a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r1 b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r1
index 9de91454ac5f..33afdacf4b0f 100644
--- a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Agda-executable/2.3.0.1/Agda-executable-2.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b7514f1c9ef2a9c6311770ccef13d7ed
diff --git a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r2 b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r2
index bd3347dada90..bd533c7a1976 100644
--- a/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-executable-2.3.0.1-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.3.0.1:=
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/Agda-executable/2.3.0.1/Agda-executable-2.3.0.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=aa34ea4ee6d0196f2cf9a23027a3675e
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7 b/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7
index d6ea2ea01003..c6e09c1ca1cc 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==sci-mathematics/agda-2.3.2*[profile?] =dev-haskell/filemanip-0.3*[profile?]
 SLOT=0
 SRC_URI=http://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=02fa17fc64af7d676061a0c52a9e3d6d
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7-r1 b/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7-r1
index c1ba91ea2cbc..835e4bae7644 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==sci-mathematics/agda-2.3.2*:=[profile?] =dev-haskell/filemanip-0.3*[profile?] >=sci-mathematics/agda-executable-2.3.0.1:= >=dev-lang/ghc-6.12.1
 SLOT=0
 SRC_URI=http://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b46b26a6fade9f76d4f3ae4ea7e858df
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.3.5 b/metadata/md5-cache/sci-mathematics/pari-2.3.5
index c65b8ddaac4a..85cce52260ac 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.3.5
+++ b/metadata/md5-cache/sci-mathematics/pari-2.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=A software package for computer-aided number theory
 EAPI=3
 HOMEPAGE=http://pari.math.u-bordeaux.fr/
 IUSE=doc data fltk gmp static-libs X
-KEYWORDS=alpha amd64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 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 ) )
 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	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=67cfb17fe83c41d6cc8a805d1704f393
+_md5_=b9096e191611616f84515bf605fa95b2
diff --git a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2 b/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2
index c6203ad946bc..2b0284e1eab0 100644
--- a/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2
+++ b/metadata/md5-cache/sci-visualization/qtiplot-0.9.8.9-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Qt based clone of the Origin plotting package
 EAPI=5
 HOMEPAGE=http://soft.proindependent.com/qtiplot.html http://www.staff.science.uu.nl/~zeven101/qtiplot.html
 IUSE=bindist doc mono latex python linguas_zh_CN linguas_cs linguas_de linguas_es linguas_fr linguas_ja linguas_ro linguas_ru linguas_sv python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3
 RDEPEND=media-libs/libemf dev-qt/qthelp:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qt3support:4 || ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 ) dev-qt/qtsvg:4 >=x11-libs/gl2ps-1.3.5[png] >=dev-cpp/muParser-1.32 >=dev-libs/boost-1.35.0:= dev-libs/quazip media-libs/libpng:= sci-libs/alglib sci-libs/gsl sci-libs/tamu_anova latex? ( dev-tex/qtexengine ) mono? ( dev-dotnet/libgdiplus ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python? ( dev-python/PyQt4[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/qtiplot-0.9.8.9-origin.patch.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=870365dfdb19e086bc75d187113d4c45
+_md5_=07dfe435e73e1b01d63c02e7283896c1
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20130424-r4 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20130424-r4
new file mode 100644
index 000000000000..f69b95eb5f12
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20130424-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20130424-r4 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cachefilesd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20130424-r4
+SLOT=0
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20130424.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20130424-r4.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	selinux-policy-2	1cce491ad8be98a717bb4f4a3ae937d5	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=5fc32e58c9a3c2f7e82ccc582dabf02d
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
new file mode 100644
index 000000000000..c3b727dd4c9d
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=dev-vcs/git >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DESCRIPTION=SELinux policy for cachefilesd
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
+SLOT=0
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multilib	fac675dcccf94392371a6abee62d909f	selinux-policy-2	1cce491ad8be98a717bb4f4a3ae937d5	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1ec3f97b09788035592100d67689283c
diff --git a/metadata/md5-cache/sys-apps/busybox-1.22.1 b/metadata/md5-cache/sys-apps/busybox-1.22.1
new file mode 100644
index 000000000000..fee865a30f9b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/busybox-1.22.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Utilities for rescue and embedded systems
+EAPI=4
+HOMEPAGE=http://www.busybox.net/
+IUSE=ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.busybox.net/downloads/busybox-1.22.1.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=63cd617c4074cb487203c16fe87bc4a6
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.4 b/metadata/md5-cache/sys-apps/debianutils-4.4
index 4e2f9fdb0352..5cc30514fbe3 100644
--- a/metadata/md5-cache/sys-apps/debianutils-4.4
+++ b/metadata/md5-cache/sys-apps/debianutils-4.4
@@ -3,10 +3,10 @@ DESCRIPTION=A selection of tools from Debian
 EAPI=4
 HOMEPAGE=http://packages.qa.debian.org/d/debianutils.html
 IUSE=kernel_linux static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=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.4.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5682866245f281859c2ce5b0e56c4be1
+_md5_=a65f7a61b0145e19523b822980d81aab
diff --git a/metadata/md5-cache/sys-apps/elfix-0.8.4 b/metadata/md5-cache/sys-apps/elfix-0.8.4
index e949a1b45555..3c6c005107ea 100644
--- a/metadata/md5-cache/sys-apps/elfix-0.8.4
+++ b/metadata/md5-cache/sys-apps/elfix-0.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=A suite of tools to work with ELF objects on Hardened Gentoo.
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/pax-quickstart.xml http://dev.gentoo.org/~blueness/elfix/
 IUSE=+ptpax +xtpax
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=~dev-python/pypax-0.8.4[ptpax=,xtpax=] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr )
 REQUIRED_USE=|| ( ptpax xtpax )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/elfix/elfix-0.8.4.tar.gz
-_md5_=8233894a8883736c699c225232f3cca5
+_md5_=d1684727d00799343791b8e986badc24
diff --git a/metadata/md5-cache/sys-apps/ethtool-3.12.1 b/metadata/md5-cache/sys-apps/ethtool-3.12.1
index bfed1be76daf..4901a89414a0 100644
--- a/metadata/md5-cache/sys-apps/ethtool-3.12.1
+++ b/metadata/md5-cache/sys-apps/ethtool-3.12.1
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/software/network/ethtool/
-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=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/network/ethtool/ethtool-3.12.1.tar.xz
-_md5_=a6879320463c4a8d50a8cfb3cbe85f26
+_md5_=e5f08450a934577ebcd6bbe258e25313
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-2 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-2
index 34fd0f53e897..3fc195b5df05 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-2
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=systemd integration files for Gentoo
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/gentoo-systemd-integration
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-apps/systemd-207
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gentoo-systemd-integration/downloads/gentoo-systemd-integration-2.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7af0e655d33d94278a2e579619247289
+_md5_=64d8757f2aca9bc9f5e47b23e12e5a32
diff --git a/metadata/md5-cache/sys-apps/help2man-1.43.3 b/metadata/md5-cache/sys-apps/help2man-1.43.3
index c053ee0a90bf..1360e6e6a595 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.43.3
+++ b/metadata/md5-cache/sys-apps/help2man-1.43.3
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/help2man/
 IUSE=nls elibc_glibc
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl elibc_glibc? ( nls? ( dev-perl/Locale-gettext ) )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.43.3.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=10db722f72c6dbac33e262759da92eaa
+_md5_=6000185052c210669a7828e3aaf2d06e
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.6.1 b/metadata/md5-cache/sys-apps/hwloc-1.6.1
index 3d12166e5398..a56375dd2f92 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.6.1
+++ b/metadata/md5-cache/sys-apps/hwloc-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=4
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo debug +numa +pci plugins svg static-libs xml X
-KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) pci? ( sys-apps/pciutils ) plugins? ( sys-devel/libtool ) numa? ( sys-process/numactl ) xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.6/downloads/hwloc-1.6.1.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1e5b28c687b7cc0babb93e5404995f5c
+_md5_=abf2180cf6b5ca6f421fb8fad6a8ca13
diff --git a/metadata/md5-cache/sys-apps/kbd-1.15.5-r1 b/metadata/md5-cache/sys-apps/kbd-1.15.5-r1
index 484949210af2..f1d9588ecb9b 100644
--- a/metadata/md5-cache/sys-apps/kbd-1.15.5-r1
+++ b/metadata/md5-cache/sys-apps/kbd-1.15.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Keyboard and console utilities
 EAPI=4
 HOMEPAGE=http://freshmeat.net/projects/kbd/
 IUSE=nls pam
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam )
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=975716a5711b109dca005e67809ecd8e
+_md5_=f3481d450120237506df5bc57f1596e1
diff --git a/metadata/md5-cache/sys-apps/kmod-15 b/metadata/md5-cache/sys-apps/kmod-15
index 1c7864ed1575..d633c3291ce2 100644
--- a/metadata/md5-cache/sys-apps/kmod-15
+++ b/metadata/md5-cache/sys-apps/kmod-15
@@ -4,11 +4,11 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma +openrc static-libs +tools zlib
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !<sys-apps/openrc-0.12 ) zlib? ( >=sys-libs/zlib-1.2.6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-15.tar.xz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=dcc64f75633efa6999a08f4c0e6536c7
+_md5_=63188354d93c8ca99656f62ec4b9e3d4
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1 b/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
index 8862d9465d14..b105bd1eaff5 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
+++ b/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Analyzes and Reports on system logs
 EAPI=5
 HOMEPAGE=http://www.logwatch.org/
-KEYWORDS=alpha amd64 arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/DateManip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/logwatch-7.4.0_p170.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=49ee57aca4291868bc7a5c46c46c1916
+_md5_=09a7b294bd87dc1c3894258c2291b199
diff --git a/metadata/md5-cache/sys-apps/man-db-2.6.5 b/metadata/md5-cache/sys-apps/man-db-2.6.5
index 71a768387ded..4ad576544ec5 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.6.5
+++ b/metadata/md5-cache/sys-apps/man-db-2.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/man-db/
 IUSE=berkdb +gdbm nls selinux static-libs zlib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libpipeline berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) !berkdb? ( !gdbm? ( sys-libs/gdbm ) ) sys-apps/groff selinux? ( sec-policy/selinux-mandb ) zlib? ( sys-libs/zlib ) !sys-apps/man
 SLOT=0
 SRC_URI=mirror://nongnu/man-db/man-db-2.6.5.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42aec7ab964fd6c527e3faccc272038d
+_md5_=7e6c60d1d25e29321dad4a867c6129bd
diff --git a/metadata/md5-cache/sys-apps/openrc-0.12.4 b/metadata/md5-cache/sys-apps/openrc-0.12.4
index 2e7b2bab7c68..bd6fc7cdff94 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.12.4
+++ b/metadata/md5-cache/sys-apps/openrc-0.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
 IUSE=debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=>=sys-apps/baselayout-2.1-r1 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 ) tools? ( dev-lang/perl ) kernel_linux? ( sys-process/psmisc ) selinux? ( sec-policy/selinux-openrc ) !<sys-fs/udev-init-scripts-17 !<sys-fs/udev-133 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.12.4.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c4f5e628136fbfecfde8bd4983ed5e19
+_md5_=c7222af661845d93bcbb6371e4323cc2
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.37 b/metadata/md5-cache/sys-apps/sg3_utils-1.37
index 40e6fc49d167..2ed0fc6d2bc2 100644
--- a/metadata/md5-cache/sys-apps/sg3_utils-1.37
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.37
@@ -4,10 +4,10 @@ DESCRIPTION=Apps for querying the sg SCSI interface
 EAPI=4
 HOMEPAGE=http://sg.danny.cz/sg/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 PDEPEND=>=sys-apps/rescan-scsi-bus-1.24
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sg3_utils-1.37.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=af5705cb9a7109955997d8ca9b0fbc21
+_md5_=684b3faa222e12f1ea499ef512e99b21
diff --git a/metadata/md5-cache/sys-apps/systemd-208-r2 b/metadata/md5-cache/sys-apps/systemd-208-r2
index c1861edafef4..5d9b69215b5d 100644
--- a/metadata/md5-cache/sys-apps/systemd-208-r2
+++ b/metadata/md5-cache/sys-apps/systemd-208-r2
@@ -4,11 +4,11 @@ DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection +kmod lzma pam policykit python qrcode selinux tcpd test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-208.tar.xz -> systemd-208-r1.tar.xz http://dev.gentoo.org/~mgorny/dist/systemd-gentoo-patchset-208_p19.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=daad2bb714ced792f4f086e4405f41d4
+_md5_=69f9400bf058dd7a1b921255115491b2
diff --git a/metadata/md5-cache/sys-apps/which-2.20-r1 b/metadata/md5-cache/sys-apps/which-2.20-r1
index 9cb7226a2f62..4fb501621786 100644
--- a/metadata/md5-cache/sys-apps/which-2.20-r1
+++ b/metadata/md5-cache/sys-apps/which-2.20-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=Prints out location of specified executables that are in your path
 EAPI=4
 HOMEPAGE=http://www.xs4all.nl/~carlo17/which/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~carlo17/which/which-2.20.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b42675a6c0f3502800a7f5423f5d5cb9
+_md5_=d7522dcd16de5fb0b19d95450814bcab
diff --git a/metadata/md5-cache/sys-auth/keystone-2013.1.4-r1 b/metadata/md5-cache/sys-auth/keystone-2013.1.4-r2
similarity index 98%
rename from metadata/md5-cache/sys-auth/keystone-2013.1.4-r1
rename to metadata/md5-cache/sys-auth/keystone-2013.1.4-r2
index f827d3ad0994..23c15b2af462 100644
--- a/metadata/md5-cache/sys-auth/keystone-2013.1.4-r1
+++ b/metadata/md5-cache/sys-auth/keystone-2013.1.4-r2
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/eventlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-keystoneclient-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=grizzly
+SLOT=0
 SRC_URI=http://launchpad.net/keystone/grizzly/2013.1.4/+download/keystone-2013.1.4.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=54cd0140e624dd94a158ae326d927e15
+_md5_=93cdd56c064e21bdf3b999f771d04f64
diff --git a/metadata/md5-cache/sys-auth/keystone-2013.1.9999 b/metadata/md5-cache/sys-auth/keystone-2013.1.9999
index ccd6fb458299..9c729ff97fab 100644
--- a/metadata/md5-cache/sys-auth/keystone-2013.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2013.1.9999
@@ -8,6 +8,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eventlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-keystoneclient-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 RESTRICT=test
-SLOT=grizzly
+SLOT=0
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=df3bbb407ffe2ee275fda59a39bf9a44
+_md5_=c57d4ad79020d21f4bca3cde24cc4282
diff --git a/metadata/md5-cache/sys-auth/keystone-2013.2.1 b/metadata/md5-cache/sys-auth/keystone-2013.2.1-r1
similarity index 99%
rename from metadata/md5-cache/sys-auth/keystone-2013.2.1
rename to metadata/md5-cache/sys-auth/keystone-2013.2.1-r1
index 9f6d1f262041..759fda4644a9 100644
--- a/metadata/md5-cache/sys-auth/keystone-2013.2.1
+++ b/metadata/md5-cache/sys-auth/keystone-2013.2.1-r1
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/webob-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dogpile-cache-0.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=havana
+SLOT=0
 SRC_URI=http://launchpad.net/keystone/havana/2013.2.1/+download/keystone-2013.2.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b31e340dd4476c3e1858d1d974fa7154
+_md5_=73c009d7985c499fe38b5ebe3b58967e
diff --git a/metadata/md5-cache/sys-auth/keystone-2013.2.9999 b/metadata/md5-cache/sys-auth/keystone-2013.2.9999
index c39215c6e0ff..1494e9514f28 100644
--- a/metadata/md5-cache/sys-auth/keystone-2013.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2013.2.9999
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dceb36600986da9d30b5afb20f93f286
+_md5_=65b9cb06d9b0b53206903d7c7ae78455
diff --git a/metadata/md5-cache/sys-auth/keystone-9999 b/metadata/md5-cache/sys-auth/keystone-9999
index e855fa85a529..6f917bf339e6 100644
--- a/metadata/md5-cache/sys-auth/keystone-9999
+++ b/metadata/md5-cache/sys-auth/keystone-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/Babel dev-python/decorator dev-python/eventlet dev-python/greenlet dev-python/httplib2 dev-python/iso8601 dev-python/lxml dev-python/netifaces dev-python/nose dev-python/nosexcover dev-python/passlib dev-python/paste dev-python/pastedeploy dev-python/python-pam dev-python/repoze-lru dev-python/routes dev-python/sphinx >=dev-python/sqlalchemy-migrate-0.7 dev-python/tempita >=dev-python/webob-1.0.8 dev-python/webtest dev-python/python-memcached ) >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The Openstack authentication, authorization, and service catalog written in Python.
 EAPI=5
 HOMEPAGE=https://launchpad.net/keystone
-IUSE=+sqlite mysql postgres ldap python_targets_python2_7
+IUSE=+sqlite mysql postgres ldap test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eventlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-keystoneclient-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.10[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/python-pam-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/webob-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[mysql,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99[postgres,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dogpile-cache-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=git-head
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dcd79bbec7401bf41c562705f59bb7fe
+SLOT=0
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=73a3e20c8aea33155e730051875929c4
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.10-r1 b/metadata/md5-cache/sys-auth/munge-0.5.10-r1
index de59ca6dd83f..c32b304e9813 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.10-r1
+++ b/metadata/md5-cache/sys-auth/munge-0.5.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An authentication service for creating and validating credentials
 EAPI=4
 HOMEPAGE=http://code.google.com/p/munge/
 IUSE=gcrypt
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt ) !gcrypt? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://munge.googlecode.com/files/munge-0.5.10.tar.bz2
 _eclasses_=user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5220ecac34b8a5318b15e36aa302059d
+_md5_=045811a5e50cda5fac0d587515ec6cf7
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r2 b/metadata/md5-cache/sys-auth/nss_ldap-265-r2
index c9165ad48158..b222f78aae70 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r2
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265-r2
@@ -4,10 +4,10 @@ DESCRIPTION=NSS LDAP Module
 EAPI=5
 HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
 IUSE=debug ssl sasl kerberos
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux
 LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7ce20b591c60722eab2632c85322bf04
+_md5_=7601e6b8c524afb521c809133212d5f2
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 7f681be48776..bae290ea116b 100644
--- a/metadata/md5-cache/sys-auth/skey-1.1.5-r8
+++ b/metadata/md5-cache/sys-auth/skey-1.1.5-r8
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Port of OpenBSD Single-key Password System
 EAPI=4
 HOMEPAGE=http://www.openbsd.org/faq/faq8.html#SKey
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD MIT RSA 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8e1dd4a8cc41476e7449f4509ca775e5
+_md5_=0ad8eb2936a12800032e7ef4bb1bd264
diff --git a/metadata/md5-cache/sys-block/aoetools-36 b/metadata/md5-cache/sys-block/aoetools-36
index b2e2c13877c4..69fcb4781a37 100644
--- a/metadata/md5-cache/sys-block/aoetools-36
+++ b/metadata/md5-cache/sys-block/aoetools-36
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=tools for ATA over Ethernet (AoE) network storage protocol
 EAPI=5
 HOMEPAGE=http://aoetools.sourceforge.net/
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoetools/aoetools-36.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b4baa1b8a5493c42e9052bb2e137ff97
+_md5_=8607243067cbd16fcd07f2843128512b
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
index 16d765bbee9f..428b86852a68 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platf
 EAPI=2
 HOMEPAGE=http://www.open-iscsi.org/
 IUSE=debug slp
-KEYWORDS=~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86
 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=464a2d507eac6e5ea165b5b120c4650c
+_md5_=475143bbb8f5ff3a87b8359b773031e6
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8
index a0ff057f7cfd..c44e7c479f88 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8
@@ -3,10 +3,10 @@ DEPEND=|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:
 DESCRIPTION=A suite of tools for thin provisioning on Linux.
 EAPI=5
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
-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=GPL-3
 RDEPEND=|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) dev-libs/expat
 SLOT=0
 SRC_URI=http://github.com/jthornber/thin-provisioning-tools/archive/v0.2.8.tar.gz -> thin-provisioning-tools-0.2.8.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3e34d393ec6fba67c9ec76aa01c0049f
+_md5_=bfaa5df18e10854a6955f59e4ee6b03c
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r1 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r1
index 7e65cc1d3605..200606b567cf 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r1
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.2.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A suite of tools for thin provisioning on Linux.
 EAPI=5
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
 IUSE=test
-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=GPL-3
 RDEPEND=dev-libs/expat
 SLOT=0
 SRC_URI=http://github.com/jthornber/thin-provisioning-tools/archive/v0.2.8.tar.gz -> thin-provisioning-tools-0.2.8.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=caccc224817dd162bf999bdd5ba6b714
+_md5_=81e38344ba8220e6217c2c149aa6aa2d
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.1.0_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.1.0_rc1
index 9b032ad6e1eb..156e64b349ee 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.1.0_rc1
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.1.0_rc1
@@ -4,10 +4,10 @@ DESCRIPTION=an API for distributing embarrassingly parallel workloads using self
 EAPI=5
 HOMEPAGE=https://github.com/hpc/libcircle
 IUSE=doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/archive/v0.1.0-rc.1.tar.gz -> libcircle-0.1.0_rc1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=473883d4b3e16bb0caa04acb6c5a8949
+_md5_=7540424f08cda2c4ac514ea02bef01ae
diff --git a/metadata/md5-cache/sys-cluster/swift-1.10.0 b/metadata/md5-cache/sys-cluster/swift-1.10.0-r1
similarity index 98%
rename from metadata/md5-cache/sys-cluster/swift-1.10.0
rename to metadata/md5-cache/sys-cluster/swift-1.10.0-r1
index b9a1da2ac33c..a48a35e32d4b 100644
--- a/metadata/md5-cache/sys-cluster/swift-1.10.0
+++ b/metadata/md5-cache/sys-cluster/swift-1.10.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/swift/havana/1.10.0/+download/swift-1.10.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=61e3a56a84ca370855d37bb99f3a776f
+_md5_=d26b8b8e323e4ba227be00733c84f36e
diff --git a/metadata/md5-cache/sys-cluster/swift-1.11.0 b/metadata/md5-cache/sys-cluster/swift-1.11.0-r1
similarity index 98%
rename from metadata/md5-cache/sys-cluster/swift-1.11.0
rename to metadata/md5-cache/sys-cluster/swift-1.11.0-r1
index a48a8fa485ab..a0588e6f73d2 100644
--- a/metadata/md5-cache/sys-cluster/swift-1.11.0
+++ b/metadata/md5-cache/sys-cluster/swift-1.11.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/swift/icehouse/1.11.0/+download/swift-1.11.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=dcd8ec41302f45c86b967d1830a91362
+_md5_=63411820747d1370cc9123c5629488f8
diff --git a/metadata/md5-cache/sys-cluster/torque-2.4.16 b/metadata/md5-cache/sys-cluster/torque-2.4.16
deleted file mode 100644
index b91c59e1f11e..000000000000
--- a/metadata/md5-cache/sys-cluster/torque-2.4.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config configure install postinst preinst prepare setup
-DEPEND=sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Resource manager and queuing system based on OpenPBS
-EAPI=2
-HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
-IUSE=tk +crypt drmaa server +syslog doc cpusets kernel_linux
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-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	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=398b6e37b1e30850d1505eb060eef66f
diff --git a/metadata/md5-cache/sys-cluster/torque-2.4.16-r1 b/metadata/md5-cache/sys-cluster/torque-2.4.16-r1
deleted file mode 100644
index 2983a4eff014..000000000000
--- a/metadata/md5-cache/sys-cluster/torque-2.4.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config configure install postinst preinst prepare setup
-DEPEND=sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Resource manager and queuing system based on OpenPBS
-EAPI=2
-HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
-IUSE=tk +crypt drmaa server +syslog doc cpusets kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-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	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a95975ec205b9c3d61e724da2c541f75
diff --git a/metadata/md5-cache/sys-cluster/torque-2.5.12-r1 b/metadata/md5-cache/sys-cluster/torque-2.5.12-r1
index 953ef0cd12c6..dfd962b2a87c 100644
--- a/metadata/md5-cache/sys-cluster/torque-2.5.12-r1
+++ b/metadata/md5-cache/sys-cluster/torque-2.5.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=4
 HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
 IUSE=cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 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.12.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b40219c271c5c6af4aed2b10c31996b5
+_md5_=08fe01efd265405ede969cc12e30a61c
diff --git a/metadata/md5-cache/sys-cluster/torque-4.1.5.1-r1 b/metadata/md5-cache/sys-cluster/torque-4.1.5.1-r1
index e05285e5ed4c..ec4a893549af 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.1.5.1-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.1.5.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=4
 HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
 IUSE=cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=torque-2.5
 RDEPEND=sys-libs/ncurses sys-libs/readline cpusets? ( sys-apps/hwloc ) 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/index.php?wpfb_dl=1058 -> torque-4.1.5.1.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f22064274c1dea2d7e2aef4389e6f1ce
+_md5_=0a93206935b707d31d7b5dabbf38a641
diff --git a/metadata/md5-cache/sys-devel/boost-m4-0.4 b/metadata/md5-cache/sys-devel/boost-m4-0.4
index 271debca0b18..99770639f8ac 100644
--- a/metadata/md5-cache/sys-devel/boost-m4-0.4
+++ b/metadata/md5-cache/sys-devel/boost-m4-0.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install unpack
 DESCRIPTION=Another set of autoconf macros for compiling against boost
 EAPI=4
 HOMEPAGE=http://github.com/tsuna/boost.m4
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://github.com/tsuna/boost.m4/tarball/v0.4 -> boost-m4-0.4.tar.gz
 _eclasses_=vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=617faf10198fe49f73ff268a336d670b
+_md5_=6141693a6c76b98664d239595f32c974
diff --git a/metadata/md5-cache/sys-devel/pmake-1.111.3.3 b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
index 1b0640331c96..8b2fb98d64c8 100644
--- a/metadata/md5-cache/sys-devel/pmake-1.111.3.3
+++ b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=BSD build tool to create programs in parallel. Debian's version of NetBSD's make
 EAPI=4
 HOMEPAGE=http://www.netbsd.org/
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmake/pmake_1.111.orig.tar.gz mirror://debian/pool/main/p/pmake/pmake_1.111-3.3.debian.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=8948e23c9b160669f0510925cf33680a
+_md5_=eb3ef11f8e0df261f35c4e6bcef15504
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.7.3.2 b/metadata/md5-cache/sys-firmware/seabios-1.7.3.2
new file mode 100644
index 000000000000..76111273c234
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/seabios-1.7.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=!binary? ( >=sys-power/iasl-20060912 ) || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=5
+HOMEPAGE=http://www.seabios.org
+IUSE=+binary
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=ppc? ( binary ) ppc64? ( binary )
+SLOT=0
+SRC_URI=http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.3.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/bios.bin-1.7.3.2.gz http://dev.gentoo.org/~cardoe/distfiles/seabios-1.7.3.2.tar.gz http://dev.gentoo.org/~cardoe/distfiles/bios.bin-1.7.3.2.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=28ea3a5c9176eb50364e7464c9ed04e3
diff --git a/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1 b/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1
new file mode 100644
index 000000000000..72e6b1156dfa
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Firmware for the Technotrend S2-6400 DVB Card
+EAPI=5
+HOMEPAGE=http://www.aregel.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=app-arch/unzip
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.aregel.de/file_download/24/dvb-ttpremium-st7109-01_v0_4_1.zip http://www.aregel.de/file_download/14/dvb-ttpremium-fpga-01_v1_09.zip http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip
+_md5_=3281528d0f492578078e202c664bdd98
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20140119 b/metadata/md5-cache/sys-fs/aufs3-3_p20140119
new file mode 100644
index 000000000000..3264e856dbb0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20140119
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20140119.tar.xz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	linux-info	a9cbd6bbe2b28166e403321882f3c73c	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=503fd3979b28b7863863c5a376a883e4
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.103 b/metadata/md5-cache/sys-fs/lvm2-2.02.103
index 94a03691e241..15b0c011a1f5 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.103
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.103
@@ -4,10 +4,10 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin
-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=GPL-2
 RDEPEND=clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) readline? ( sys-libs/readline ) udev? ( >=virtual/udev-200[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/clvm !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.2.1 )
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.103.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.103.tgz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a68247e48e3301fb266d54a5e16bdc1e
+_md5_=c03349190bb72039ce77f6c293a95ce7
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2013.1.13 b/metadata/md5-cache/sys-fs/ntfs3g-2013.1.13
index f0fd18b06eca..6c5e0d1ba8a3 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2013.1.13
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2013.1.13
@@ -4,10 +4,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=5
 HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/
 IUSE=acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
 SLOT=0
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2013.1.13.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1fc38e0061a156d135c4e73ad84e1c51
+_md5_=954ab05c4a6af3623d5dde51c3369901
diff --git a/metadata/md5-cache/sys-fs/udiskie-0.6.2 b/metadata/md5-cache/sys-fs/udiskie-0.6.2
new file mode 100644
index 000000000000..ca82c2cb79e8
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udiskie-0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/asciidoc dev-python/setuptools userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
+DESCRIPTION=An automatic disk mounting service using udisks
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/udiskie http://github.com/coldfix/udiskie
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-python/dbus-python dev-python/notify-python dev-python/pygobject:2 dev-python/pyxdg sys-fs/udisks python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/u/udiskie/udiskie-0.6.2.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=03e832fae7d67be113d9a883ad7522a0
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.3 b/metadata/md5-cache/sys-fs/xfsdump-3.1.3
index 709b133a0dbb..1b75e096bf1d 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.3
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.3
@@ -3,10 +3,10 @@ DEPEND=sys-fs/e2fsprogs !<sys-fs/xfsprogs-3 sys-apps/dmapi >=sys-apps/attr-2.4.1
 DESCRIPTION=xfs dump/restore utilities
 EAPI=4
 HOMEPAGE=http://oss.sgi.com/projects/xfs
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ~ppc64 -sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-fs/e2fsprogs !<sys-fs/xfsprogs-3 sys-apps/dmapi >=sys-apps/attr-2.4.19
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-3.1.3.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsdump-3.1.3.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ebd58014263d0e27d4f0f90b2f7eb3ea
+_md5_=3ff4c591f511e7a3d5271f1d172d0f5e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.22 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.22
deleted file mode 100644
index b420250c5b39..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.22
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.22
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10_p20131111.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-30.base.tar.xz mirror://gentoo/genpatches-3.10-30.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-30.experimental.tar.xz ) )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c44229fad5c8c8fd5ba71d8cb0487eab
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.24 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.24
deleted file mode 100644
index d11be43f5241..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.24
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10_p20131111.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-31.base.tar.xz mirror://gentoo/genpatches-3.10-31.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-31.experimental.tar.xz ) )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7bd87d3ede492aab2c90520384a9b406
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.4 b/metadata/md5-cache/sys-kernel/aufs-sources-3.12.4
deleted file mode 100644
index 9b412070118d..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12_p20131111.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-5.base.tar.xz mirror://gentoo/genpatches-3.12-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-5.experimental.tar.xz ) )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=86c3a2e4b6d5ac37c12f82cc750f6ccf
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.5 b/metadata/md5-cache/sys-kernel/aufs-sources-3.12.5
deleted file mode 100644
index 5f3a00380a45..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12_p20131111.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-6.base.tar.xz mirror://gentoo/genpatches-3.12-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-6.experimental.tar.xz ) )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=920b840576f04574bfef7332d78fdbad
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.6 b/metadata/md5-cache/sys-kernel/aufs-sources-3.12.6
deleted file mode 100644
index e4857cc74a07..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.12.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.12_p20131111.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.12-7.base.tar.xz mirror://gentoo/genpatches-3.12-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-7.experimental.tar.xz ) )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=29e2bf031f13ed0b86d3e3c244bef5ea
diff --git a/metadata/md5-cache/sys-kernel/dracut-026-r2 b/metadata/md5-cache/sys-kernel/dracut-026-r2
deleted file mode 100644
index c34aa3215325..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-026-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-198-r5 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper optimization net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-198-r5 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=app-shells/dash-0.5.4.11 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-026.tar.bz2
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d512bbf3f84696c9b96d6199185f6596
diff --git a/metadata/md5-cache/sys-kernel/dracut-027-r3 b/metadata/md5-cache/sys-kernel/dracut-027-r3
deleted file mode 100644
index f87df5c3e59e..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-027-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper optimization net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=app-shells/dash-0.5.4.11 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-027.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=11ef07517867dbd9ef1c818f4bdf24ed
diff --git a/metadata/md5-cache/sys-kernel/dracut-029 b/metadata/md5-cache/sys-kernel/dracut-029
deleted file mode 100644
index 4b51eb9a8ca7..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-029
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper optimization net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=app-shells/dash-0.5.4.11 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-029.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f287637be8af03493f3e18fad25acbd5
diff --git a/metadata/md5-cache/sys-kernel/dracut-030 b/metadata/md5-cache/sys-kernel/dracut-030
deleted file mode 100644
index 4bc62df2b41e..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-030
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper optimization net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-030.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=03a736aeb3ddeba3b6ca5132fe88edcd
diff --git a/metadata/md5-cache/sys-kernel/dracut-031-r1 b/metadata/md5-cache/sys-kernel/dracut-031-r1
deleted file mode 100644
index 10af6b055fc9..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-031-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper optimization net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-031.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=697658ffef20ee32a8b1f81dcce6ecfc
diff --git a/metadata/md5-cache/sys-kernel/dracut-033-r3 b/metadata/md5-cache/sys-kernel/dracut-033-r3
deleted file mode 100644
index 3c2b730e91f6..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-033-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_dash dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] >=sys-apps/sysvinit-2.87-r3 >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-033.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=728fe30dd1716038e3e2340c70a416d8
diff --git a/metadata/md5-cache/sys-kernel/dracut-034-r3 b/metadata/md5-cache/sys-kernel/dracut-034-r3
deleted file mode 100644
index e856360f190a..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-034-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig
-DESCRIPTION=Generic initramfs generation tool
-EAPI=4
-HOMEPAGE=http://dracut.wiki.kernel.org
-IUSE=debug device-mapper net selinux dracut_modules_biosdevname dracut_modules_bootchart dracut_modules_btrfs dracut_modules_caps dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_dash dracut_modules_gensplash dracut_modules_mdraid dracut_modules_multipath dracut_modules_plymouth dracut_modules_syslog dracut_modules_systemd dracut_modules_crypt dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_livenet dracut_modules_lvm dracut_modules_cifs dracut_modules_iscsi dracut_modules_livenet dracut_modules_nbd dracut_modules_nfs dracut_modules_ssh-client
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux? ( sec-policy/selinux-dracut ) app-arch/cpio >=app-shells/bash-4.0 >=sys-apps/baselayout-1.12.14-r1 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 virtual/pkgconfig debug? ( dev-util/strace ) device-mapper? ( >=sys-fs/lvm2-2.02.33 ) net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) selinux? ( sys-libs/libselinux sys-libs/libsepol ) dracut_modules_biosdevname? ( sys-apps/biosdevname ) dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct ) dracut_modules_btrfs? ( sys-fs/btrfs-progs ) dracut_modules_caps? ( sys-libs/libcap ) dracut_modules_cifs? ( net-fs/cifs-utils ) dracut_modules_crypt? ( sys-fs/cryptsetup ) dracut_modules_crypt-gpg? ( app-crypt/gnupg ) dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 ) dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) dracut_modules_gensplash? ( media-gfx/splashutils ) dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 ) dracut_modules_multipath? ( sys-fs/multipath-tools ) dracut_modules_nbd? ( sys-block/nbd ) dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) dracut_modules_ssh-client? ( dev-libs/openssl ) dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-034.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6854859beda2180b2a498c93d38b29aa
diff --git a/metadata/md5-cache/sys-kernel/dracut-034-r4 b/metadata/md5-cache/sys-kernel/dracut-034-r4
index 6a7f9d97a209..1205a2c76e5a 100644
--- a/metadata/md5-cache/sys-kernel/dracut-034-r4
+++ b/metadata/md5-cache/sys-kernel/dracut-034-r4
@@ -10,6 +10,6 @@ RDEPEND=virtual/udev dracut_modules_systemd? ( >=sys-apps/systemd-199 ) selinux?
 REQUIRED_USE=dracut_modules_bootchart? ( !dracut_modules_systemd ) dracut_modules_crypt-gpg? ( dracut_modules_crypt ) dracut_modules_crypt-loop? ( dracut_modules_crypt ) dracut_modules_livenet? ( dracut_modules_dmsquash-live ) dracut_modules_crypt? ( device-mapper ) dracut_modules_dmraid? ( device-mapper ) dracut_modules_dmsquash-live? ( device-mapper ) dracut_modules_livenet? ( device-mapper ) dracut_modules_lvm? ( device-mapper ) dracut_modules_cifs? ( net ) dracut_modules_iscsi? ( net ) dracut_modules_livenet? ( net ) dracut_modules_nbd? ( net ) dracut_modules_nfs? ( net ) dracut_modules_ssh-client? ( net )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-034.tar.bz2
+SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-034.tar.bz2 http://dev.gentoo.org/~aidecoe/distfiles/sys-kernel/dracut/034-0010-module-setup.sh-add-comments.patch.bz2
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=5f891db7451c504da9a3c8059f813e06
+_md5_=8e2b398d4a33898b92268ef6517d5eae
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178
deleted file mode 100644
index 29a94b262691..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-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 dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r178
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz 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-183.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=875684eb2073543b31163208cfcda014
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r188 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r188
deleted file mode 100644
index e6646d776067..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r188
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-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 dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r188
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz 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-193.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=05bfcf6b8a94f69c408204c79197bb8d
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1
deleted file mode 100644
index 4fc741066b4e..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.10)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-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 dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.1-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.10.1-2.extras.tar.bz2 mirror://gentoo/genpatches-3.10-3.base.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3f5dfbefa469554e436ceb781e0576f7
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.12.6-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.12.8
similarity index 88%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.12.6-r4
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.12.8
index 7f253a9001db..9706e0442d54 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.12.6-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.12.8
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.12.6-r4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.12.6-5.extras.tar.bz2 mirror://gentoo/genpatches-3.12-7.base.tar.xz
+SLOT=3.12.8
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.12.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.12-9.base.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=08b6463557c40e6a02ace59e408a9164
+_md5_=5eaf18da158a28b6b1fabfbd58e01f91
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4
deleted file mode 100644
index fa618014de65..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-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 dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.48-r4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.48-5.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c27d14f5090b87979cea560b8e35eb12
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.53-r5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.53-r5
deleted file mode 100644
index 690ea50977d1..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.53-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-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 dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.53-r5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.53-6.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d652591b8541b6d6c422a661e6284e13
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.54 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.54-r2
similarity index 92%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.54
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.2.54-r2
index 7b7f01a38322..d44f8496b41a 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.54
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.54-r2
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.54
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.54-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+SLOT=3.2.54-r2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.54-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=2dc37304569265b9363efab0e8335d1c
+_md5_=d603ff6727fe91da9c068ef7100bf04a
diff --git a/metadata/md5-cache/sys-libs/libcap-2.22 b/metadata/md5-cache/sys-libs/libcap-2.22
index 4f88422ee5ec..74667677ebea 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.22
+++ b/metadata/md5-cache/sys-libs/libcap-2.22
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=2
 HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html
 IUSE=pam
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=75452f2139aa17133538ab17328e0435
+_md5_=4f421606ca88e432efa9939cf54f09d8
diff --git a/metadata/md5-cache/sys-libs/libcap-2.22-r1 b/metadata/md5-cache/sys-libs/libcap-2.22-r1
index a3aef6fb498f..5c7a56a48d49 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.22-r1
+++ b/metadata/md5-cache/sys-libs/libcap-2.22-r1
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=4
 HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html
 IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=sys-apps/attr pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cefea54fdc05770feb55bd50d521217c
+_md5_=7645535a852ffa433b16d779c2e21821
diff --git a/metadata/md5-cache/sys-libs/libcap-2.22-r2 b/metadata/md5-cache/sys-libs/libcap-2.22-r2
index 40f62d650ebe..4bfc0b4d16a6 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.22-r2
+++ b/metadata/md5-cache/sys-libs/libcap-2.22-r2
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=4
 HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html
 IUSE=pam abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=23caa7664f83b1d3ede262edc4e5699e
+_md5_=f363621a13275322d40d7d86aafb5b74
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
index 84c83c5bd722..5a67bb28f5db 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=5
 HOMEPAGE=http://people.redhat.com/sgrubb/libcap-ng/
 IUSE=python static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5baf02a6154791b55e2902d6b9b5bd5c
+_md5_=b4e594cc9259484fce10a057f1f44d89
diff --git a/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 b/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
index 7e7c10cfde59..2342f2c6ab74 100644
--- a/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
+++ b/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DEPEND=>=sys-libs/ncurses-5.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=Another cute console display library
 EAPI=4
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-002 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-003 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-004 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-005 mirror://gnu/readline/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-002 mirror://gnu/readline/readline-6.2-patches/readline62-003 mirror://gnu/readline/readline-6.2-patches/readline62-004 mirror://gnu/readline/readline-6.2-patches/readline62-005
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=56966f9f155483f8c2f68efb14a18200
+_md5_=afa9222cb3aec7fa107fc05cbbe6707b
diff --git a/metadata/md5-cache/sys-process/lsof-4.85-r2 b/metadata/md5-cache/sys-process/lsof-4.85-r2
index d553093372c6..3da06eedfef3 100644
--- a/metadata/md5-cache/sys-process/lsof-4.85-r2
+++ b/metadata/md5-cache/sys-process/lsof-4.85-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux ) rpc? ( virtual/pkgconfig )
 DESCRIPTION=Lists open files for running Unix processes
 EAPI=2
 HOMEPAGE=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
@@ -10,4 +10,4 @@ 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	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0b3d4e65f9cb470cf5a17cce9ed2d4be
+_md5_=da3df15d00900735ef6467b3138c7b61
diff --git a/metadata/md5-cache/sys-process/lsof-4.87-r1 b/metadata/md5-cache/sys-process/lsof-4.87-r1
index 3c1ebded49e3..40873d608c09 100644
--- a/metadata/md5-cache/sys-process/lsof-4.87-r1
+++ b/metadata/md5-cache/sys-process/lsof-4.87-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux ) rpc? ( virtual/pkgconfig )
 DESCRIPTION=Lists open files for running Unix processes
 EAPI=4
 HOMEPAGE=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
@@ -10,4 +10,4 @@ RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.87.tar.bz2 ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_4.87.tar.bz2 ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_4.87.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f56c7f55a9ee9b3f6c2f7e4e2b621e04
+_md5_=553ed0a553eb82c1a2827a0cddc05c02
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r1 b/metadata/md5-cache/sys-process/numad-0.5-r1
new file mode 100644
index 000000000000..7237e3bf5335
--- /dev/null
+++ b/metadata/md5-cache/sys-process/numad-0.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare setup
+DESCRIPTION=The NUMA daemon that manages application locality
+EAPI=5
+HOMEPAGE=http://fedoraproject.org/wiki/Features/numad
+KEYWORDS=~amd64 -arm -s390 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://git.fedorahosted.org/git/?p=numad.git;a=snapshot;h=334278ff3d774d105939743436d7378a189e8693;sf=tbz2 -> numad-0.5-334278f.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=046dae29745e92ee9d8f2508096dd15a
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 0c8b55ac2f0a..5c872f6724ef 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -1,9 +1,9 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-vcs/git dev-vcs/git
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-vcs/git
 DESCRIPTION=The NUMA daemon that manages application locality
-EAPI=4
+EAPI=5
 HOMEPAGE=http://fedoraproject.org/wiki/Features/numad
 LICENSE=LGPL-2.1
 SLOT=0
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1192f6944a909c540ff58351e4c8d1f5
+_md5_=6482a2e3a72de5770f0b611cfe68f62d
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921
index 4b052947309a..7aad6a76997e 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.120.921
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-2.120.921
 SLOT=0
-_md5_=81014a967f7f1d90f26a4079517c0556
+_md5_=322d851543a876b85bc0fb58f475f2d5
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.140 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.140
index bc3e3c591680..28248b0212b3 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.140
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.140
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-2.132.140
 SLOT=0
-_md5_=3bfc9e22d83f302427466620aadcce4c
+_md5_=ad39413d9594f3eb6c7f3d68cc0d1e3b
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.510 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.510
index b4d52c550fad..bb5ad7786abe 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.510
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.132.510
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-2.132.510
 SLOT=0
-_md5_=7641fdf413600510e02b4cf1dfc21c2e
+_md5_=5fff59db7b1a4fec3af1bd003ac29996
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0
index 354441fb4ae1..ec737ce43d5f 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.122.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-Requirements-2.122.0
 SLOT=0
-_md5_=256cd3179ca3e275522c180a05e8a027
+_md5_=ff998af8fc047d93181fed556ab9962f
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.123.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.123.0
index f2f38a0df4a4..6dd28d4d08c6 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.123.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.123.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-Requirements-2.123.0
 SLOT=0
-_md5_=102f9fab96d3fded10bf9359dce4fc68
+_md5_=7ab9ce36c995cc981df67ed343e78e08
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0
index 33df842fa92f..4d00a7e2fb6a 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-Requirements-2.125.0
 SLOT=0
-_md5_=7c4ffbe6402db57e16f45096140084a2
+_md5_=8b1ca830ba42b0f6ce474c279163eb6b
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0
index efe07807479c..7fbe4e544c5e 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.8.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-YAML
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/CPAN-Meta-YAML-0.8.0
 SLOT=0
-_md5_=9ace17c593fc2c30874743105336edc0
+_md5_=31debe1e4702af4ce64fea46a0933e0e
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r3 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r3
index 078ec1a776f1..62c3122736f2 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r3
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Command-1.170.0 )
 SLOT=0
-_md5_=ae26b487670fbd60f62af68e5385e20f
+_md5_=b13a9f40e349d183ce5b95722cf5507a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
index 56cdc101b3ef..e247956af332 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Command-1.170.0 )
 SLOT=0
-_md5_=cccb876cdc81bcf7ee88edabc386e992
+_md5_=105fcf380c6558807d1a0da93e1b608e
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0
index c3ef0da152ca..35eb23e36006 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Command-1.180.0 )
 SLOT=0
-_md5_=9d63c1e7fac80598719143ba42da96a7
+_md5_=6aae42e381b5eee2c80fe54cb22ca5ac
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r2
index 6f7fe83eaaa0..90e62d96bd71 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Constant
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Constant-0.230.0 )
 SLOT=0
-_md5_=af262b410f948641d499e268edaf3ca5
+_md5_=6285907b36c53399469af5fc0c175b73
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.540.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.540.0
index 527f37131f5c..865af166eddc 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.540.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.540.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-Install-1.540.0
 SLOT=0
-_md5_=21fb469ecee56a1ba85e86128f462ad0
+_md5_=fcdd52c373fc5d483c7143a1fbd05c71
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.640.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.640.0
index b2205e00d6b6..6c2d861584ae 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.640.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.640.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-MakeMaker-6.640.0
 SLOT=0
-_md5_=6923081eb9300594d061e5305cb39fa4
+_md5_=7ed4ab4ea52afe4a1b8a18f707972a16
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.720.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.720.0
index 7ed9c258f7c2..6e18b7166264 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.720.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.720.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-MakeMaker-6.720.0
 SLOT=0
-_md5_=90fa5f6590a9bc18deff2a4bd0a0dab5
+_md5_=de5c8225b0ad3177a00c9cdfb29f7cbe
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.740.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.740.0
index 3e6606c5a88d..b87f32871ab5 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.740.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.740.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-MakeMaker-6.740.0
 SLOT=0
-_md5_=8d97d98a3800e1c67090f38d1780d91b
+_md5_=4ce187bab043aa70037be694ac3a6474
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.820.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.820.0
index 4e1f0f9050b0..de09e386eb76 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.820.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.820.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-MakeMaker-6.820.0
 SLOT=0
-_md5_=a5c94035429f3efc7350de7568c91a12
+_md5_=117a3fe667322ee7df4588de57f0189d
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.610.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.610.0
index d60f4bcf0d74..e3f3c4ec33c0 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.610.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.610.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Manifest
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-Manifest-1.610.0
 SLOT=0
-_md5_=c9563142e2b0fcafa66c43a0ad98241d
+_md5_=985f23fe0b2da596635bca5d80ba22ce
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0
index 1ef2551591be..51874d9267a2 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.630.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Manifest
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/ExtUtils-Manifest-1.630.0
 SLOT=0
-_md5_=9f2a34091bf5d88c03e58483ec2584d8
+_md5_=e5df69d9e6227ec07bc033cdbf542cb9
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.400.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.400.0
index 4fd49d1d74f2..4dba242b4b4a 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.400.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.400.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Spec-3.400.0
 SLOT=0
-_md5_=d4429f2b26dd054de6e31c20cc1d664f
+_md5_=a2dfd9d5a3b43dd52d92fb19d9d88b06
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.220.0-r2 b/metadata/md5-cache/virtual/perl-File-Temp-0.220.0-r2
index 2b5487ff4cc8..2ed3775aa065 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.220.0-r2
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.220.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/File-Temp-0.220.0 )
 SLOT=0
-_md5_=28e2529f66902c006bf89111157ef902
+_md5_=590a073098c2a1d191fd9c06a73dd8d1
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.100 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.100
index c9eb1ca2403d..90f578e07c4d 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.100
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.230.100
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/File-Temp-0.230.100 )
 SLOT=0
-_md5_=0c41a298cb1ebb6e03cbf81e1d0c180f
+_md5_=8f6d11d0805fab34910368bac236a530
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.400 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.400
index 28452ce4888d..89e560f7da7b 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.400
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.230.400
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/File-Temp-0.230.400 )
 SLOT=0
-_md5_=333e37f39a6da15cd6eb3e7f234a6040
+_md5_=755e76c533c2f8f5603d33baf7e80efc
diff --git a/metadata/md5-cache/virtual/perl-IO-1.25 b/metadata/md5-cache/virtual/perl-IO-1.25
index c605dd4391ed..0537502feac2 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.25
+++ b/metadata/md5-cache/virtual/perl-IO-1.25
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/IO-1.25
 SLOT=0
-_md5_=5c2327594cd6ff9fe4d98c68168a0fe8
+_md5_=2ce19d055d5ddd5fc8d08cc1165cdf22
diff --git a/metadata/md5-cache/virtual/perl-IO-1.280.0 b/metadata/md5-cache/virtual/perl-IO-1.280.0
index f32951b29aa5..34ec927ab061 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.280.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.280.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/IO-1.280.0 )
 SLOT=0
-_md5_=43f1831892523f9550a37beae38dd6b6
+_md5_=090ca0eb6d72ac261f8f228e817745a2
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.0-r1 b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.0-r1
index 60e0c7bab53c..130164d6e590 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.0-r1
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.16* ~perl-core/JSON-PP-2.272.0 )
 SLOT=0
-_md5_=c273aa5927a0501df2eef88a01b1defb
+_md5_=dccfad680786eb4e15f0499d4819ff8c
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.20 b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.20
index 1fa38fde6d13..bc5fe523027e 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.20
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.20
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/JSON-PP-2.272.20
 SLOT=0
-_md5_=7df69166efadfee783436c6b74a05e86
+_md5_=b039dd7f46a1a5788ab6344a67830c9f
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400
index 9c5a49419494..2b07e7f9211c 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.400
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Parse-CPAN-Meta-1.440.400
 SLOT=0
-_md5_=36f8adfd8d550ba8d62902e8d6f79993
+_md5_=19116dc1b4aea0a2574eed5bab97ac18
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.500 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.500
index dcad5e48a75a..5ad0e673b2fb 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.500
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.500
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Parse-CPAN-Meta-1.440.500
 SLOT=0
-_md5_=22bc7f45e2f2b3d412e032ccf2ebf037
+_md5_=816b957b27dbdf1a2487a02c8f0a0528
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.700 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.700
index 2c10ddecfb03..c3d56973f1db 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.700
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.700
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Parse-CPAN-Meta-1.440.700
 SLOT=0
-_md5_=defc78b4ebcbdf86aa9c01a33fde7f12
+_md5_=c71379939f300879babbaafd258d9dcb
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900
index a9433bbfc74f..57816059a11d 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.440.900
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Parse-CPAN-Meta-1.440.900
 SLOT=0
-_md5_=ab8b1a48a5d5bb19229c0bb7562c1ed8
+_md5_=9ad679dc79d7a611fa6a38f4fe9a9463
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.270.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.270.0
index 33ad6288f130..6e24b1da07db 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.270.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.270.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.270.0
 SLOT=0
-_md5_=8e6d470fec77d4630d55152ac202a229
+_md5_=15967e65102b40013419cee417805213
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.300.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.300.0
index ccb0786d090c..eb9f3fafb240 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.300.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.300.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.300.0
 SLOT=0
-_md5_=42629a72ede4964772071fe5d0d2ebdd
+_md5_=dafcc8c6bbb23cd7a6b2d5e71ebcb3ee
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.310.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.310.0
index 46613618ead9..c5d4d190bc57 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.310.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.310.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.310.0
 SLOT=0
-_md5_=b40ae071db4252ccd8f912edd6cb340b
+_md5_=c8638ab8946169e55d9d12f1c97926ed
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.320.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.320.0
index bdd97ce13b90..e8c197c8a5ac 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.320.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.320.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.320.0
 SLOT=0
-_md5_=58eb9d2d542ec26859e28e0f6338b9fb
+_md5_=a70111dd7209e47dacf63c31dca4a53a
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.350.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.350.0
index 136d0681c3ac..eaeb66b743d4 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.350.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.350.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.350.0
 SLOT=0
-_md5_=bf56a11f995176b3f5cc81a8a28af2e1
+_md5_=2335da759e4317309b50605116f57a40
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.9.0 b/metadata/md5-cache/virtual/perl-Socket-2.9.0
index 3137af8123fa..1d15b60aba18 100644
--- a/metadata/md5-cache/virtual/perl-Socket-2.9.0
+++ b/metadata/md5-cache/virtual/perl-Socket-2.9.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Socket
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Socket-2.9.0 )
 SLOT=0
-_md5_=3f3a86bbdb2913ed00816a0d19b3b773
+_md5_=6cc7c285b9bb0b542cef022d1f3b3e76
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r2 b/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r2
index b49a9c621b2a..c69c76feaf4f 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r2
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Test-Simple-0.980.0 )
 SLOT=0
-_md5_=46d7174ce55c5438a1cfe97408e7aac6
+_md5_=0b06f42537d8be71f96123c79c883ae3
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r3 b/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r3
index db5f0f871082..01786be3621e 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r3
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-0.980.0-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/Test-Simple-0.980.0 )
 SLOT=0
-_md5_=6024b8bf6a824a6aa8ce1ad038a8a149
+_md5_=63a92a9ad6526975c5b9be65401686d4
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.100 b/metadata/md5-cache/virtual/perl-version-0.990.100
index 0799bda97da8..4ab7968ceace 100644
--- a/metadata/md5-cache/virtual/perl-version-0.990.100
+++ b/metadata/md5-cache/virtual/perl-version-0.990.100
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/version-0.990.100
 SLOT=0
-_md5_=a62f871b0be7643416bb7743d37676ad
+_md5_=4bf5fe0159e13b2b952c63e063e3528d
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.200 b/metadata/md5-cache/virtual/perl-version-0.990.200
index b4d260791f3a..41e42a01635c 100644
--- a/metadata/md5-cache/virtual/perl-version-0.990.200
+++ b/metadata/md5-cache/virtual/perl-version-0.990.200
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/version-0.990.200
 SLOT=0
-_md5_=e43dfb261c409254cba8cf947c0c801f
+_md5_=7b71a59abedf5c6c66874bf2938da921
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.300 b/metadata/md5-cache/virtual/perl-version-0.990.300
index 007f534a85cf..07ac4a0c4c2b 100644
--- a/metadata/md5-cache/virtual/perl-version-0.990.300
+++ b/metadata/md5-cache/virtual/perl-version-0.990.300
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/version-0.990.300
 SLOT=0
-_md5_=e2a1bead27f44e9eb849a0e7528e5163
+_md5_=37e1de3f5d6925d1d4df46a32dca8c41
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.400 b/metadata/md5-cache/virtual/perl-version-0.990.400
index d017ac469f89..0c5fe1782fd1 100644
--- a/metadata/md5-cache/virtual/perl-version-0.990.400
+++ b/metadata/md5-cache/virtual/perl-version-0.990.400
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/version-0.990.400
 SLOT=0
-_md5_=a24c132acdaca9950e6ec7881eee905b
+_md5_=3f8cd74c0f1ebbd9d50f5010b81d1760
diff --git a/metadata/md5-cache/www-apps/gitit-0.10.3.1 b/metadata/md5-cache/www-apps/gitit-0.10.3.1
index 9d1f5de50fee..ba82fa086064 100644
--- a/metadata/md5-cache/www-apps/gitit-0.10.3.1
+++ b/metadata/md5-cache/www-apps/gitit-0.10.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/pandoc-1.10.0.5:=[profile?] <app-text/pandoc-1.12:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/cgi:=[profile?] >=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?] >=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?] =dev-haskell/filestore-0.6*:=[profile?] >=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?] >=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.8:=[profile?] >=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.8:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.1.0.0:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/pandoc-types-1.10*:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/recaptcha-0.1:=[profile?] dev-haskell/safe:=[profile?] >dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?] dev-haskell/syb:=[profile?] =dev-haskell/tagsoup-0.12*:=[profile?] dev-haskell/text:=[profile?] =dev-haskell/url-2.1*:=[profile?] =dev-haskell/utf8-string-0.3*:=[profile?] dev-haskell/xhtml:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] =dev-haskell/xss-sanitize-0.3*:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-6.12.1:= plugins? ( dev-haskell/ghc-paths:=[profile?] )
 SLOT=0/0.10.3.1
 SRC_URI=mirror://hackage/packages/archive/gitit/0.10.3.1/gitit-0.10.3.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=e5264f1acbfc6ec0be379620f873afca
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0 b/metadata/md5-cache/x11-libs/libGLw-8.0.0
index 21684d8cf868..2cb4a6196ded 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 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/motif virtual/opengl
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a5300eba67897c8865eb68af0ee3b2ff
+_md5_=4f2de596d649c5c541ffc93a560b4d8d
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.13 b/metadata/md5-cache/x11-misc/xmobar-0.13
index a41a2cc57287..f653ea9c96a5 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.13
+++ b/metadata/md5-cache/x11-misc/xmobar-0.13
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.13/xmobar-0.13.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c7b80dddcbfc17a6759fde5d7860d9a0
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.14 b/metadata/md5-cache/x11-misc/xmobar-0.14
index a0e57844d8ae..b673aac4a6c4 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.14
+++ b/metadata/md5-cache/x11-misc/xmobar-0.14
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrandr mpd? ( media-sound/mpd )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.14/xmobar-0.14.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7169f1f744d2845f76990daf7d4aa715
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.16-r1 b/metadata/md5-cache/x11-misc/xmobar-0.16-r1
index bd0064f199f5..f6ab825ee380 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.16-r1
+++ b/metadata/md5-cache/x11-misc/xmobar-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXrandr wifi? ( net-wireless/wireless-tools ) mpd? ( media-so
 REQUIRED_USE=mpris? ( dbus )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.16/xmobar-0.16.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=9fe660971984da81bdba47fc56d99299
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.18 b/metadata/md5-cache/x11-misc/xmobar-0.18
index 1f03fb0ab16d..f70a75d4de38 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.18
+++ b/metadata/md5-cache/x11-misc/xmobar-0.18
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrandr wifi? ( net-wireless/wireless-tools ) mpd? ( media-sound/mpd )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.18/xmobar-0.18.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=b1f42ff658a4d30af789e5d105ac032d
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.2-r1 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.2-r1
index 079586a939c6..62a746704498 100644
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.2-r1
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A terminal emulator for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/terminal/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26 >=x11-libs/gtk+-2.24:2 x11-libs/libX11 >=x11-libs/vte-0.28:0 >=xfce-base/libxfce4ui-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.6/xfce4-terminal-0.6.2.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=6cabfe3d0d91c99e866826c824a202b7
+_md5_=46710f4f7c4c1099b0e499fc905287fa
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.8.17-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.8.17-r1
index 5797e1e9edd5..438e573adb94 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.8.17-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.8.17-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=X? ( x11-libs/libxcb x11-libs/libX11 x11-libs/xcb-util-image ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) !x11-themes/gtk-engines-qtcurve virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+DEPEND=X? ( x11-libs/libxcb x11-libs/libX11 x11-libs/xcb-util-image ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) !x11-themes/gtk-engines-qtcurve virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 DESCRIPTION=A set of widget styles for Qt and GTK2
 EAPI=5
 HOMEPAGE=https://github.com/QtCurve/qtcurve
 IUSE=+X gtk kde nls +qt4 qt5 windeco aqua kde
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libxcb x11-libs/libX11 x11-libs/xcb-util-image ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) !x11-themes/gtk-engines-qtcurve kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=X? ( x11-libs/libxcb x11-libs/libX11 x11-libs/xcb-util-image ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 dev-qt/qtx11extras:5 ) ) kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) !x11-themes/gtk-engines-qtcurve kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=gtk? ( X ) windeco? ( kde X ) || ( gtk qt4 qt5 )
 SLOT=0
 SRC_URI=https://github.com/QtCurve/qtcurve/archive/1.8.17.tar.gz -> qtcurve-1.8.17.tar.gz https://github.com/QtCurve/qtcurve/commit/69047935dd4a9549d238cbc457e9c3cfa37386ae.patch -> qtcurve-1.8.17-old_config_file.patch
 _eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=80e87a9830524ed40511a3941e0d5e0c
+_md5_=1cb2dde78283fbaca40499fcc164607e
diff --git a/metadata/md5-cache/x11-wm/openbox-3.5.2-r1 b/metadata/md5-cache/x11-wm/openbox-3.5.2-r1
index 92d1b263d0fb..402027602020 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.5.2-r1
+++ b/metadata/md5-cache/x11-wm/openbox-3.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
 EAPI=5
 HOMEPAGE=http://openbox.org/
 IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_targets_python2_6 python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=xdg? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.5.2.tar.gz branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b0792a34b6019076400dd7ab47e373b3
+_md5_=f9e6da04191492cf2663f6062ba256aa
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.10 b/metadata/md5-cache/x11-wm/xmonad-0.10
index aeb909ec625d..0f1e098ead0b 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.10
+++ b/metadata/md5-cache/x11-wm/xmonad-0.10
@@ -10,5 +10,5 @@ PDEPEND=default-term? ( x11-terms/xterm ) x11-apps/xmessage
 RDEPEND=dev-haskell/extensible-exceptions[profile?] dev-haskell/mtl[profile?] =dev-haskell/utf8-string-0.3*[profile?] =dev-haskell/x11-1.5*[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmonad/0.10/xmonad-0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=dbdb0e382ed0ae6166fd67b76520815a
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.11 b/metadata/md5-cache/x11-wm/xmonad-0.11
index 923998b1eb46..dd32802f063e 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.11
+++ b/metadata/md5-cache/x11-wm/xmonad-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] =dev-haskell/utf8-string-0.3*:=[profile?] >=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11
 SRC_URI=mirror://hackage/packages/archive/xmonad/0.11/xmonad-0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=cd733739b3e4cdd23f5571970354abcb
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.11-r1 b/metadata/md5-cache/x11-wm/xmonad-0.11-r1
index 6c785a2189cc..56b883c34472 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.11-r1
+++ b/metadata/md5-cache/x11-wm/xmonad-0.11-r1
@@ -10,5 +10,5 @@ PDEPEND=default-term? ( x11-terms/xterm ) x11-apps/xmessage
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] =dev-haskell/utf8-string-0.3*:=[profile?] >=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11
 SRC_URI=mirror://hackage/packages/archive/xmonad/0.11/xmonad-0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=65b063ffb25275a5e4b2fd2d63004b16
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.10 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.10
index fef4a519e795..7f27445f2f79 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.10
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/mtl-3[profile?] dev-haskell/random[profile?] dev-haskell/utf8-string[profile?] =dev-haskell/x11-1.5*[profile?] xft? ( >=dev-haskell/x11-xft-0.2[profile?] ) ~x11-wm/xmonad-0.10[profile?] >=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.10/xmonad-contrib-0.10.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=1b9a5214405612a3f88c608e8e5eb26d
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11
index 029839b89ae0..d8df835b3f43 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] =dev-haskell/x11-1.6*:=[profile?] >=dev-haskell/x11-xft-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= =x11-wm/xmonad-0.11*:=[profile?]
 SLOT=0/0.11
 SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.11/xmonad-contrib-0.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=766543c9cbe1a12bdf56434271edd08c
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.1 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.1
index 5d76d1d4daa0..4ede7a941fd4 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.1
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-6.10.4:= =x11-wm/xmonad-0.11*:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 SLOT=0/0.11.1
 SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.11.1/xmonad-contrib-0.11.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=717a7a64180a97975a0b96beca64ec80
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.2 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.2
index 3c2478716d61..2ead04e1c9a0 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.2
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-6.10.4:= =x11-wm/xmonad-0.11*:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 SLOT=0/0.11.2
 SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.11.2/xmonad-contrib-0.11.2.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	ghc-package	419a74a0fe876385690dfe3c4281bac7	haskell-cabal	481d999da090733b68828c266eda24fb	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=18c11307bbb28ca82b7b30f9578824b6
diff --git a/metadata/md5-cache/x11-wm/xpra-0.10.12 b/metadata/md5-cache/x11-wm/xpra-0.10.12-r1
similarity index 99%
rename from metadata/md5-cache/x11-wm/xpra-0.10.12
rename to metadata/md5-cache/x11-wm/xpra-0.10.12-r1
index 8edd99afb74b..8da24c13006b 100644
--- a/metadata/md5-cache/x11-wm/xpra-0.10.12
+++ b/metadata/md5-cache/x11-wm/xpra-0.10.12-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) clipboard?
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-0.10.12.tar.bz2
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=161c5b09f74a762d67cf3e23d88be36d
+_md5_=a89c187925e754705711526e87448158
diff --git a/metadata/md5-cache/xfce-base/garcon-0.2.1 b/metadata/md5-cache/xfce-base/garcon-0.2.1
index 43c9374a16df..b0dd4604b6a8 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.2.1
+++ b/metadata/md5-cache/xfce-base/garcon-0.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/libraries/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.14 >=xfce-base/libxfce4util-4.10.1
 SLOT=0
 SRC_URI=mirror://xfce/src/libs/garcon/0.2/garcon-0.2.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=37bea61a0c05acbcc1dfa47693c556ac
+_md5_=4f6c3a580f6f8db547aad0daf11bdf0b
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.10.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.10.1
index 8a0a9c5485d6..b20cb7ed6c08 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.10.1
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A basic utility library for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfce4util/4.10/libxfce4util-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=727c5c7363e32a813e95ae71ad9115ac
+_md5_=dd7575fff3bb37a4c172fa2489231d18
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.3 b/metadata/md5-cache/xfce-base/thunar-1.6.3
index 64e06953df44..85456055ec4c 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.3
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/ http://thunar.xfce.org/
 IUSE=+dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev test
-KEYWORDS=~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/xfconf-4.10 dbus? ( >=dev-libs/dbus-glib-0.100 ) exif? ( >=media-libs/libexif-0.6.19 ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6 ) startup-notification? ( x11-libs/startup-notification ) udev? ( virtual/udev[gudev] ) xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10 ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.10.1 ) udev? ( || ( >=gnome-base/gvfs-1.10.1[udisks,udev] >=gnome-base/gvfs-1.10.1[gdu,udev] ) ) xfce_plugins_trash? ( >=gnome-base/gvfs-1.10.1 )
 REQUIRED_USE=xfce_plugins_trash? ( dbus )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.6/Thunar-1.6.3.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	virtualx	73cfc129b4b9ba23aed1abb10c825d86	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=1c9ac2e4f13c9073903048683483cfae
+_md5_=5023a5ea76d0b98be9b44bdbfc34279f
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.1 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.1
index 5b9301fc9975..b6897034c289 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.1
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to find and launch installed applications for the Xfce deskto
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-appfinder/4.10/xfce4-appfinder-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=e3c2c2c1f4d8c3d3df46dcc6778b187c
+_md5_=163cdfbe324f92504597c973b6aaad20
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.1
index f855384c4778..edb8f3bcfb7a 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.10.1
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 >=xfce-base/exo-0.8 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.10/xfce4-panel-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=398577fb0bd711051f67e57bb2ce7fbb
+_md5_=67d9f550a6a9a8f12870b9a006d68c6c
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.10.1
index d81b0c1196e2..ca2b4f5268f7 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.10.1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A session manager for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://docs.xfce.org/xfce/xfce4-session/start
 IUSE=debug systemd udev +xscreensaver
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.10.1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 !xfce-base/xfce-utils systemd? ( >=sys-auth/polkit-0.100 ) x11-apps/xrdb x11-misc/xdg-user-dirs udev? ( >=sys-power/upower-0.9.20 ) xscreensaver? ( || ( >=x11-misc/xscreensaver-5.15 gnome-extra/gnome-screensaver >=x11-misc/xlockmore-5.38 >=x11-misc/slock-1 ) )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-session/4.10/xfce4-session-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=4cad77e450a5dde8efbc12a51c935658
+_md5_=a452925828422285a4a0edadfaeca072
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.10.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.10.1
index 702dfbc41500..5fbf949ed676 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.10.1
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Configuration system for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug libcanberra libnotify +xklavier
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) libnotify? ( >=x11-libs/libnotify-0.7 ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-settings/4.10/xfce4-settings-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=e4e4525e105e6965fbece7cd8617a3ef
+_md5_=656349f32bee424b2971498206f89dd3
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.10.1 b/metadata/md5-cache/xfce-base/xfwm4-4.10.1
index 1461cd5cd4d6..dabbc35d1c2d 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.10.1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug startup-notification +xcomposite
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.24:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/xfconf-4.10 startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfwm4/4.10/xfwm4-4.10.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=1d24d928203e3f103753040bffa5f910
+_md5_=9c35c5dcaa43f171690d07da15af7e62
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1
index 3503094a6f09..b79de2bae28a 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Archive plug-in for the Thunar filemanager
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=3c892ff9fd65b1259dfd369901a289ff
+_md5_=0968b895b2fbb7bef4c88fe7ac3a51d7
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1
index 4abe46f18ba9..7c584f201b90 100644
--- a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1
+++ b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Adds special features for media files to the Thunar File Manager
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
 IUSE=debug
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.1.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=dc6bddca1e400e7832eb4d11f6b3bbcc
+_md5_=89863d0d4f7302f3d7756f4cfcd96265
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.1.29 b/metadata/md5-cache/xfce-extra/tumbler-0.1.29
index 3be6549a7444..8bee67ae9d8b 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.1.29
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.1.29
@@ -4,10 +4,10 @@ DESCRIPTION=A thumbnail service for the filemanager of Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://www.xfce.org/projects/thunar/
 IUSE=curl debug ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( net-misc/curl:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/tumbler/0.1/tumbler-0.1.29.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=141df841371a4ba1363e62459ea58862
+_md5_=a2ffa9b2f2b3f2a50b5aacd995bfca8d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.0
index 413e6b87d02a..051d95deab65 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A panel plugin for showing information about cpufreq settings
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-cpufreq-plugin/1.1/xfce4-cpufreq-plugin-1.1.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=0667cd0c102980f1b9dcd85176b12cbd
+_md5_=b2977644e27ea113547998f5c2a559a6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.4.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.4.0
index 0e0d909e3fba..6a8a3f454fff 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.4.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-embed-plugin/1.4/xfce4-embed-plugin-1.4.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=060dfb05cbed39ca625ea7350f788631
+_md5_=89dc35a025e0cadef2a337a2efe7ed55
diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.3 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.3
index d0fb7dcf9cca..bcd57942b533 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Panel plug-in that displays information about earthquakes at regular
 EAPI=5
 HOMEPAGE=http://www.e-quake.org/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=http://www.e-quake.org/wp-uploads/2013/09/xfce4-equake-plugin-1.3.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=3270831ea9b13d2e93df57c22d1d22dc
+_md5_=9fafcc37b782682da9bbdf76c37cb590
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
index 2d47a7efc132..90403a4d5fa3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
 IUSE=debug ipv6 ssl
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt >=net-libs/gnutls-2 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=bfa196a1358c074e1affe8419303634f
+_md5_=5975f03c0304d4c3e4b1a3b65bae9825
diff --git a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0-r1
index 0e3b58a2d84d..3e3918436bf3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.2.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A network load plug-in for the Xfce panel
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-netload-plugin/1.2/xfce4-netload-plugin-1.2.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=3fed48368afc8263cadf30de7bf3e555
+_md5_=28ccb3d4735b11a7d68738722787aa39
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4
index 5ec28f86799a..0a29115bd81f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Notification daemon for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-notifyd
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1.6 >=x11-libs/gtk+-2.14:2 >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfconf-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.2/xfce4-notifyd-0.2.4.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=342c7ba852b6ba42a8108218718c4547
+_md5_=60e05fd808e24670991555a5c56a7d4b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.6.0
index 358f679c999c..03753edeca3a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.6.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=A panel plug-in to provide quick access to files, folders and remova
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
 IUSE=debug libnotify
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-places-plugin/1.6/xfce4-places-plugin-1.6.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=d26430012005cedfa8ed8335ee902289
+_md5_=a5bd1982cbabf1a28ea9ec493d99f2ed
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r2 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r2
index dbf63621deec..c2be6deab884 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r2
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Power manager for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-power-manager
 IUSE=debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 >=sys-power/upower-0.9.16 >=x11-libs/gtk+-2.20:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext >=xfce-base/xfconf-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 policykit? ( >=sys-auth/polkit-0.104-r1 ) xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 ) networkmanager? ( net-misc/networkmanager ) udisks? ( sys-fs/udisks:0 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-power-manager/1.2/xfce4-power-manager-1.2.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=3a945bc359e33b75504716682146aeb3
+_md5_=e3bc8bd3b62c53a44b5139cb2ab1847b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0-r1
index 5cca0e4c76ff..8a7297704488 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Task Manager
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-taskmanager
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/cairo >=x11-libs/gtk+-2.12:2 x11-libs/libwnck:1
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-taskmanager/1.0/xfce4-taskmanager-1.0.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=bc43c16593fe01a643bbe7d550528e23
+_md5_=71d06edc2f7a66ac85ab1d129ca353c3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.5.0 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.5.0
index 94010c6ba9b5..c00c79c4ddfb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.5.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10
 DESCRIPTION=A simple timer plug-in for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-timer-plugin/1.5/xfce4-timer-plugin-1.5.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=dd0ffa9f6e38f73c2b62b1ca972c3411
+_md5_=1eed84aa5bd3247926370d319253b600
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0
index 39b3bc82a5c9..560b56876e6b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon to control volume up/down and mute keys for pulseaudio
 EAPI=5
 HOMEPAGE=http://launchpad.net/xfce4-volumed-pulse
 IUSE=debug libnotify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/keybinder:0 >=media-sound/pulseaudio-0.9.19[glib] >=x11-libs/gtk+-2.20:2 >=xfce-base/xfconf-4.8 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://launchpad.net/xfce4-volumed-pulse/trunk/0.2.0/+download/xfce4-volumed-pulse-0.2.0.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=a559ec0a7013c74a94537c272632ac5b
+_md5_=5f348f19febb7eb4da57f622bbbf92ed
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.3.0
deleted file mode 100644
index 85270494d3b8..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/gtk+:2 xfce-base/exo xfce-base/garcon xfce-base/libxfce4ui xfce-base/libxfce4util xfce-base/xfce4-panel virtual/libintl virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=5
-HOMEPAGE=http://gottcode.org/xfce4-whiskermenu-plugin/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 xfce-base/exo xfce-base/garcon xfce-base/libxfce4ui xfce-base/libxfce4util xfce-base/xfce4-panel virtual/libintl
-SLOT=0
-SRC_URI=http://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.3.0-src.tar.bz2
-_eclasses_=cmake-utils	0ff4fbaea3a849e97cb3e0b87ab99136	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	62e05953761097ae84a70d6c7a3e2c9c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f0438c33b316e712190d58bd4a0b69a1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
index 745e2148695e..e1feefefa41f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Xfce panel plugin which allows to put the maximized window title and
 EAPI=5
 HOMEPAGE=http://github.com/cedl38/xfce4-windowck-plugin
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=http://github.com/cedl38/xfce4-windowck-plugin/archive/v0.2.4.tar.gz -> xfce4-windowck-plugin-0.2.4.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=2a82392d113d93ae5955e5107d2ca1f5
+_md5_=38297db7ce09a3ec75ba5a364bd55c21
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.6 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.6
index 89d778ad9662..9dc1b044b360 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
 EAPI=5
 HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=>=gnome-base/librsvg-2.36.2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.12:1 x11-libs/libX11 >=x11-libs/libxklavier-5 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.6.tar.bz2
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xfconf	ba58c6f43e7fdfc116752aa58b488d83
-_md5_=71fd7f02d3eee934258c34b1337e738d
+_md5_=f652f61901217038fbcc55a20dcf70d0
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 194abe203075..44e3ec19e0fb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2014 07:37:03 +0000
+Mon, 20 Jan 2014 10:37:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2df5bc75e127..b926d6dfe489 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 19 07:37:01 UTC 2014
+Mon Jan 20 10:37:03 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8ecf65694dbd..9970a648f895 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 19 Jan 2014 08:00:01 +0000
+Mon, 20 Jan 2014 11:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d159ed805bb3..64c31339cbde 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1390116901 Sun Jan 19 07:35:01 2014 UTC
+1390214101 Mon Jan 20 10:35:01 2014 UTC
diff --git a/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
new file mode 100644
index 000000000000..10c377ac7678
--- /dev/null
+++ b/net-analyzer/ifstat/files/ifstat-1.1-hardened.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -58,7 +58,7 @@
+      /*) file=$with_proc; with_proc=yes ;;
+      *) file=/proc/net/dev
+   AC_MSG_CHECKING([for proc interface in $file])
+-  if grep -q Inter- $file 2>/dev/null; then
++  if true; then
+     AC_DEFINE([USE_PROC], 1, [Define if you want to use /proc to get stats])
+     AC_DEFINE_UNQUOTED([PROC_FILE], ["$file"], [Proc file to poll for stats])
+     with_proc=yes
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 6e10923b6dae..c983888f3f78 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r2.ebuild,v 1.8 2013/12/22 12:05:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1-r2.ebuild,v 1.9 2014/01/19 12:27:32 jer Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -22,6 +22,8 @@ DOCS=( HISTORY README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-hardened.patch
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
new file mode 100644
index 000000000000..8e01989fe6fe
--- /dev/null
+++ b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
@@ -0,0 +1,11 @@
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf,
+ 				 size_t bufsize)
+ {
+ 	time_t interval = time(NULL) - entry->conn_starttime;
++	if (interval < 1)
++		interval = 1;
+ 
+ 	char rbuf[64];
+ 	rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
similarity index 83%
rename from net-analyzer/iptraf-ng/iptraf-ng-1.1.4.ebuild
rename to net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
index 7c385e850e20..e7c4336d06fd 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-1.1.4.ebuild,v 1.1 2013/07/23 18:30:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild,v 1.3 2014/01/20 08:24:13 pinkbyte Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc"
 
 RESTRICT="test"
@@ -39,6 +39,8 @@ src_prepare() {
 		-e 's|rvnamed|&-ng|g' \
 		-e 's|RVNAMED|&-NG|g' \
 		src/*.8 || die
+
+	epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
 }
 
 # configure does not do very much we do not already control
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
new file mode 100644
index 000000000000..b5b0013c72d5
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild,v 1.1 2014/01/19 14:14:40 jer Exp $
+
+EAPI=5
+inherit eutils git-r3 toolchain-funcs
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
+EGIT_REPO_URI="https://git.fedorahosted.org/git/iptraf-ng.git"
+
+LICENSE="GPL-2 doc? ( FDL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!net-analyzer/iptraf
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS/s:= -g -O2:+= :' \
+		-e '/^LDFLAGS =/d' \
+		-e 's|$(QUIET_[[:alpha:]]*)||g' \
+		Makefile || die
+	sed -i \
+		-e 's|IPTRAF|&-NG|g' \
+		-e 's|IPTraf|&-NG|g' \
+		-e 's|iptraf|&-ng|g' \
+		-e 's|rvnamed|&-ng|g' \
+		-e 's|RVNAMED|&-NG|g' \
+		src/*.8 || die
+}
+
+# configure does not do very much we do not already control
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
+	default
+}
+
+src_install() {
+	dosbin {iptraf,rvnamed}-ng
+
+	doman src/*.8
+	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
+	use doc && dohtml -a gif,html,png -r Documentation/*
+
+	keepdir /var/{lib,log}/iptraf-ng #376157
+}
diff --git a/net-dialup/linux-atm/linux-atm-2.5.0.ebuild b/net-dialup/linux-atm/linux-atm-2.5.0.ebuild
index 1e4901e77d95..94eb53c9f57f 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.0.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.5.0.ebuild,v 1.12 2013/02/09 19:51:57 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.5.0.ebuild,v 1.13 2014/01/19 20:03:06 vapier Exp $
 
 inherit eutils libtool flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index 972fc33ab05c..86dbeaed8383 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.5.2.ebuild,v 1.1 2013/02/09 20:24:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.5.2.ebuild,v 1.2 2014/01/19 20:03:06 vapier Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild
index a1a1b5a151a1..eb8f2943be63 100644
--- a/net-dns/avahi/avahi-0.6.30-r3.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.18 2013/08/03 09:45:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.19 2014/01/19 21:27:11 moult Exp $
 
 EAPI="3"
 
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
+		mono? ( >=dev-lang/mono-1.1.8 )
 	)"
 RDEPEND="${COMMON_DEPEND}
 	howl-compat? ( !net-misc/howl )
diff --git a/net-dns/bind/bind-9.9.4_p2.ebuild b/net-dns/bind/bind-9.9.4_p2.ebuild
index d1bd904bd1ad..d8b2f1f90167 100644
--- a/net-dns/bind/bind-9.9.4_p2.ebuild
+++ b/net-dns/bind/bind-9.9.4_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4_p2.ebuild,v 1.7 2014/01/18 18:16:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4_p2.ebuild,v 1.9 2014/01/19 13:46:55 ago Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -53,7 +53,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads
 urandom xml"
diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild b/net-ftp/atftp/atftp-0.7-r3.ebuild
index 1a5d38ed248e..df5af7d824c6 100644
--- a/net-ftp/atftp/atftp-0.7-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7-r3.ebuild,v 1.3 2014/01/11 17:16:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7-r3.ebuild,v 1.4 2014/01/19 10:28:57 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic systemd
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/lftp/lftp-4.4.14.ebuild b/net-ftp/lftp/lftp-4.4.14.ebuild
index f91f5ca59317..31d0911b019e 100644
--- a/net-ftp/lftp/lftp-4.4.14.ebuild
+++ b/net-ftp/lftp/lftp-4.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.14.ebuild,v 1.8 2014/01/18 20:18:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.14.ebuild,v 1.9 2014/01/19 10:32:43 ago Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.yar.ru/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW )
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
index 4f8d98cb1a46..e3d3e0c63cfb 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild,v 1.6 2014/01/18 20:16:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild,v 1.7 2014/01/19 10:29:49 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="+introspection python"
 
 RDEPEND="
diff --git a/net-libs/libasyncns/libasyncns-0.8-r3.ebuild b/net-libs/libasyncns/libasyncns-0.8-r3.ebuild
index a92645441544..a9fb08097faf 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r3.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libasyncns/libasyncns-0.8-r3.ebuild,v 1.8 2014/01/18 20:13:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libasyncns/libasyncns-0.8-r3.ebuild,v 1.9 2014/01/19 10:25:53 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 SLOT="0"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 
diff --git a/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
index 5a4ffbb61465..9a2c791fde3f 100644
--- a/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
+++ b/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild,v 1.1 2013/10/22 16:20:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild,v 1.2 2014/01/19 11:30:56 pacho Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ LICENSE="MIT"
 
 SRC_URI="https://gitorious.org/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild b/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild
index 3f92d3334879..9dbb61502043 100644
--- a/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild
+++ b/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild,v 1.4 2013/12/24 12:47:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbluedevil/libbluedevil-1.9.4.ebuild,v 1.5 2014/01/19 11:15:16 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://projects.kde.org/projects/playground/libs/libbluedevil"
 SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/net-libs/libkgapi/libkgapi-2.0.2.ebuild b/net-libs/libkgapi/libkgapi-2.0.2.ebuild
index b44a87280152..fe3c83532366 100644
--- a/net-libs/libkgapi/libkgapi-2.0.2.ebuild
+++ b/net-libs/libkgapi/libkgapi-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/libkgapi-2.0.2.ebuild,v 1.2 2014/01/18 18:58:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/libkgapi-2.0.2.ebuild,v 1.3 2014/01/19 10:32:57 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ DESCRIPTION="Library for accessing Google calendar and contact resources"
 HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="debug"
 SLOT=4
 
diff --git a/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild
index 9486b5b7bc98..c1947aae128c 100644
--- a/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild,v 1.1 2013/10/12 17:57:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-3.5.0.ebuild,v 1.2 2014/01/19 15:40:32 pacho Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ DESCRIPTION="Library for accessing the features of social networking site vkonta
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 SLOT=4
 
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
new file mode 100644
index 000000000000..b081c3af9e15
--- /dev/null
+++ b/net-libs/libmbim/Manifest
@@ -0,0 +1 @@
+DIST libmbim-1.6.0.tar.xz 360800 SHA256 e0efbdaf2aeddec033b4c7c5d0f7934c91ce535c5c9f0cadf1e67527d10ab082 SHA512 60c20da65cb5e0e5e3d73434c8b7960ebb7138d6b004d4e6223ba63ea95fdc97b35697a329f12a81033c39c36efcbb3bcb5d8ae813a569dc6e6ca928a1cd79dd WHIRLPOOL 08408f332bfb41ac29e705c462b56899e988ce28ba581202ac6b54f7beee0769b106d4f3bbef7f6484ba68c6dbb27bed905b9611393775ef72f13138b7036aa3
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
new file mode 100644
index 000000000000..ac335fcddd01
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-1.6.0.ebuild,v 1.1 2014/01/20 05:06:40 alexxy Exp $
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc) \
+		$(use_with test{,s})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-9999.ebuild b/net-libs/libmbim/libmbim-9999.ebuild
new file mode 100644
index 000000000000..5f1e8eecdd97
--- /dev/null
+++ b/net-libs/libmbim/libmbim-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-9999.ebuild,v 1.1 2014/01/20 05:06:40 alexxy Exp $
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc) \
+		$(use_with test{,s})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/kde-base/kdesdk-misc/metadata.xml b/net-libs/libmbim/metadata.xml
similarity index 60%
rename from kde-base/kdesdk-misc/metadata.xml
rename to net-libs/libmbim/metadata.xml
index f1e21d4c8f9e..4d7d21afc425 100644
--- a/kde-base/kdesdk-misc/metadata.xml
+++ b/net-libs/libmbim/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>kde</herd>
-<use>
-	<flag name="extras">Build po2xml and swappo tools</flag>
-</use>
+<maintainer>
+	<email>alexxy@gentoo.org</email>
+	<name>Alexey Shvetsov</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild b/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild
index 2515f60b564d..a16b2645497d 100644
--- a/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild,v 1.1 2013/10/12 17:52:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmediawiki/libmediawiki-3.5.0.ebuild,v 1.2 2014/01/19 15:40:48 pacho Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
 HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 SLOT=4
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild
index 57d25e96388b..6237efed5d18 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild,v 1.7 2014/01/07 09:32:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmicrohttpd/libmicrohttpd-0.9.32.ebuild,v 1.9 2014/01/19 10:47:36 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 IUSE="epoll messages ssl static-libs test"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 85e00de90cfd..b3ab0cfee437 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,2 +1,3 @@
 DIST libqmi-1.0.0.tar.gz 2398450 SHA256 aea6b4c027bc24bdf5a624b50be8413c796c266c1e134425a8e783fb7b5ff419 SHA512 7d1a057fadd65e16e623670cc1a6292c9dc2e22630d329e820320c70acbabba519280bd76a954a5308d395cae23893ba5700b213e397457a8b7410ec6b8fc157 WHIRLPOOL 95a3341068d852f3754ba8c8bfa139a03de38e9a0ad861c84124e3cf55740576a66f8c9a1b33dac8d7c8b3f4924ac3be5a26ccf95d876c79c431949dcb19e2c3
 DIST libqmi-1.4.0.tar.xz 592684 SHA256 812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3 SHA512 ca20352ba0eb4e03946b366ddcfec2892fda1e5dc8351816ee2314bc3d4235637eb143066f0f96bd9a9b5b5b3198265432beb8a984617e6618ddbd5c937e2b93 WHIRLPOOL 99418e9c91f89058279f9353b8b2b277f12fdda85f3114b005be59db9432fed91148bd6bcb3519bc4267cd2d1479c818cd8816d9c6d38a7721ad18f6b2fdd80e
+DIST libqmi-1.8.0.tar.xz 659720 SHA256 fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d SHA512 016fdcdb8e66452be5c82107f00189292822afe97ec3e3a458b5a6bce2174a428035d76efd5f57497a07bfd62991e4330ebe150e91dd178c4f698be8e537d372 WHIRLPOOL 67f9addbb70203dfdb3bf379a1599ce9df197a1cc8e619795c08e28f3247c730f3f106fd02368834815cf1b55b64d22dc23a5108a42e8c509cd9ac4cc1593a93
diff --git a/net-libs/libqmi/libqmi-1.8.0.ebuild b/net-libs/libqmi/libqmi-1.8.0.ebuild
new file mode 100644
index 000000000000..b9439baef82d
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.8.0.ebuild,v 1.1 2014/01/20 04:58:40 alexxy Exp $
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		$(use_enable static{-libs,}) \
+		$(use_enable {,gtk-}doc) \
+		$(use_with test{,s})
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 8ccc73cee670..4d4971d42f49 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.6 2013/06/30 18:27:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.7 2014/01/20 04:58:40 alexxy Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit multilib
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi"
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 fi
 
 DESCRIPTION="QMI modem protocol helper library"
@@ -40,5 +40,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
 }
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index e0a49204e8ec..b1647b8ca159 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -5,4 +5,8 @@
  <email>vapier@gentoo.org</email>
  <description>feel free to update</description>
 </maintainer>
+<maintainer>
+	<email>alexxy@gentoo.org</email>
+	<name>Alexey Shvetsov</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/neon/neon-0.30.0.ebuild b/net-libs/neon/neon-0.30.0.ebuild
index e40e60cb9454..68dc58e7025d 100644
--- a/net-libs/neon/neon-0.30.0.ebuild
+++ b/net-libs/neon/neon-0.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.30.0.ebuild,v 1.6 2014/01/18 20:19:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.30.0.ebuild,v 1.7 2014/01/19 10:33:40 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
 for lingua in ${IUSE_LINGUAS}; do
diff --git a/net-misc/bfgminer/bfgminer-3.5.6.ebuild b/net-misc/bfgminer/bfgminer-3.5.6.ebuild
index 040ab3f27613..d8be9a19bfa6 100644
--- a/net-misc/bfgminer/bfgminer-3.5.6.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.6.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.6.ebuild,v 1.2 2014/01/19 11:31:19 pacho Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 # Waiting for dev-libs/hidapi to be keyworded
 #KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
diff --git a/net-misc/connman/connman-1.19.ebuild b/net-misc/connman/connman-1.19.ebuild
index ca87ace8241a..e4c824f845a7 100644
--- a/net-misc/connman/connman-1.19.ebuild
+++ b/net-misc/connman/connman-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.19.ebuild,v 1.5 2014/01/14 15:35:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.19.ebuild,v 1.6 2014/01/19 10:26:07 ago Exp $
 
 EAPI="5"
 inherit base systemd
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit tools vpnc +wifi"
 
 RDEPEND=">=dev-libs/glib-2.16
diff --git a/net-misc/memcached/memcached-1.4.17.ebuild b/net-misc/memcached/memcached-1.4.17.ebuild
index d002e18e44ab..743f7f21d933 100644
--- a/net-misc/memcached/memcached-1.4.17.ebuild
+++ b/net-misc/memcached/memcached-1.4.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.17.ebuild,v 1.8 2014/01/18 20:16:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.17.ebuild,v 1.9 2014/01/19 12:32:51 maekke Exp $
 
 EAPI=5
 inherit eutils autotools flag-o-matic user
@@ -14,7 +14,7 @@ SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4
diff --git a/net-misc/netifrc/netifrc-0.1.ebuild b/net-misc/netifrc/netifrc-0.1.ebuild
index 902d563bd796..ab3fe0f7a09d 100644
--- a/net-misc/netifrc/netifrc-0.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netifrc/netifrc-0.1.ebuild,v 1.10 2014/01/18 09:10:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netifrc/netifrc-0.1.ebuild,v 1.13 2014/01/19 19:38:15 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/putty/putty-0.63.ebuild b/net-misc/putty/putty-0.63.ebuild
deleted file mode 100644
index 65e045f136b0..000000000000
--- a/net-misc/putty/putty-0.63.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.63.ebuild,v 1.7 2013/09/15 15:57:32 jer Exp $
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils toolchain-funcs versionator
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="
-	http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-	http://dev.gentoo.org/~jer/${PN}-icons.tar.bz2"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="doc ipv6 kerberos"
-
-RDEPEND="
-	!net-misc/pssh
-	dev-libs/glib
-	kerberos? ( virtual/krb5 )
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cd "${S}"/unix || die
-	sed -i \
-		-e '/AM_PATH_GTK(/d' \
-		-e 's|-Wall -Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf $(use_with kerberos gssapi)
-}
-
-src_compile() {
-	cd "${S}"/unix || die
-	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		dohtml doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	for i in 16 22 24 32 48 64 128 256; do
-		newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-	done
-
-	# install desktop file provided by Gustav Schaffter in #49577
-	make_desktop_entry ${PN} PuTTY ${PN} Network
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.1.ebuild b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
index 53a710b9a3d5..262188309550 100644
--- a/net-misc/rdesktop/rdesktop-1.8.1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.1.ebuild,v 1.8 2014/01/18 20:14:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.1.ebuild,v 1.9 2014/01/19 10:26:20 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 6b0c6accd875..2ee9b205919c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2013.10.09.tar.gz 1202448 SHA256 7f08ebb841530cccc4550d0468f8a5e53a83c5e95464c74b42032668b85a44a6 SHA512 4462f17239e4e66935bfb4ec1078264b53c70ee3e515f98010d76f5c7177618c7d7d96dae315a9f174ecc4dd541619b3c3f47ad9c2cd8a0fa7f29f94e570d63b WHIRLPOOL 2a5c19d66035df04e13f8c58380f17b828b22a42b8d8182985848cbf8e8b404ded10041b7b4bbf13dd67b4a71b2ac3261972f4355e95dca766bb802a469e644e
 DIST youtube-dl-2013.12.20.tar.gz 539134 SHA256 eb83b2112c7098c32ab66f9051900e2a35d24992ba98e7ca74ef10a16e061933 SHA512 f9e954ce66be58c6f8d832ebd8de6d392b6348af4d2161cc61d243aea9901abd455e33d894493fac8ce07caca341d63cc2a7769924f0f28fd83992f400f29e25 WHIRLPOOL 5a3e47388d057ce74514b835f2352ddf0baf90b249eff6a91f463a7fd0a032f946a2bc33c50cc02c6a472d83193162783f1c5e08a5e84c08f256a4462e248962
-DIST youtube-dl-2013.12.26.tar.gz 555975 SHA256 ac0d35d32a0f333843da078f26addfcd52c58bb24fe099a2ed481d71f145f3b5 SHA512 1dac8eddfef54b346b2bbd14b25620c77eeea34148d40e744c68270c6db0403ba2931e865722a4f942e51e5d5f26b5bb25e07ded0ccf997d3123f8936be698eb WHIRLPOOL 03362094a26829ed986fb82585ec8ea6b802e080d406b8151a0214dc308cbca3259e5f3315f66dac80e12c0995058474778894a91975b74263833fb04cf4e1f1
 DIST youtube-dl-2014.01.03.tar.gz 559937 SHA256 ad9f35e9f4ee6db560d1ffda5e893853acaa9a979041dbf98c3ba12e811aef07 SHA512 993b11b42755933d7e5300ea1dd47ce34dffae7c36a807844c85586a1f3d3cc9066d2c9aad44905cfd5cc177f873aac3d6e17cd8c1223d896f21707ee2da42eb WHIRLPOOL 479e6da369b18008f7257f8b2990730254c9ace7362c451e1248147c557524920a2b826c81decf72cb685df82c8aec8b01755462f258b828db4cd701259f6543
 DIST youtube-dl-2014.01.05.6.tar.gz 567248 SHA256 8b6996f16124be12e432d14b5fb67fc9f253e5f0867d6c919fce39b0f4660ef2 SHA512 855012a9dac30d5fa29ab9deeba950cb5469346f5628f7a7e61a70876d0b365dd72d990ce389aa19e60b83108d765e3826c84c3ab2ac4fc9aee06aa45f0923ab WHIRLPOOL 916fb39f579516f176f26dce056b10722dc64888a71d0233632553b6e698d316c44e8a14ccfa042a8f74d8e8ddcf8c29fdab25b59e2d8f50adbd133ebb139235
 DIST youtube-dl-2014.01.06.1.tar.gz 569894 SHA256 96c707d32bd95de83cba5f8abdac9b6e642070758d32a1a09aac3a96e43ee05c SHA512 8a01cc8ecdd4e42d3c7ce34d2ad07916db33b04b721dfc94345ba7441e3abe63e101fd4c351d0a0dde07d3d5b3e7dba35f3730e1c8bf842e9e985530faea0bef WHIRLPOOL 1a49ae5c0cbc5abed2037e1f8e13b11b66beffe30b4b6f0a9e984ba276f1eba633c8a4c25532a7ce426407a27e501dfcef32a3eca51af29e890eda2991f72d2c
diff --git a/net-misc/youtube-dl/youtube-dl-2013.10.09.ebuild b/net-misc/youtube-dl/youtube-dl-2013.10.09.ebuild
deleted file mode 100644
index b13e3d9f524d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2013.10.09.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.10.09.ebuild,v 1.6 2013/11/25 19:50:17 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		local xxx=( pornotube redtube thisav xhamster xnxx xvideos youjizz youporn )
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.py || die
-	fi
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild b/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild
index 05810ae68b19..1100474a4260 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild,v 1.5 2013/12/24 12:56:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.12.20.ebuild,v 1.6 2014/01/19 10:16:39 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
 DEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2013.12.26.ebuild b/net-misc/youtube-dl/youtube-dl-2013.12.26.ebuild
deleted file mode 100644
index c87b85f329e3..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2013.12.26.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.12.26.ebuild,v 1.1 2013/12/28 13:47:31 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		local xxx=(
-			extremetube mofosex pornhd pornhub pornotube redtube spankwire
-			thisav tube8 xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.py || die
-	fi
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-print/hplip/hplip-3.14.1.ebuild b/net-print/hplip/hplip-3.14.1.ebuild
index 33da6753dd39..e98a75df88f3 100644
--- a/net-print/hplip/hplip-3.14.1.ebuild
+++ b/net-print/hplip/hplip-3.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.14.1.ebuild,v 1.4 2014/01/14 15:31:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.14.1.ebuild,v 1.5 2014/01/19 10:33:13 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 
 # zeroconf does not work properly with >=cups-1.4.
 # Thus support for it is also disabled in hplip.
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild
index 6be4f6a6acf0..d6028c4ad89c 100644
--- a/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild
+++ b/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild,v 1.4 2014/01/14 15:31:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/b43-fwcutter/b43-fwcutter-018.ebuild,v 1.5 2014/01/19 10:26:33 ago Exp $
 
 inherit toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://bues.ch/b43/fwcutter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 IUSE=""
 DEPEND=""
diff --git a/net-wireless/bluedevil/bluedevil-1.3.2.ebuild b/net-wireless/bluedevil/bluedevil-1.3.2.ebuild
index 8c1f3ebe95ed..c96ffdeacb39 100644
--- a/net-wireless/bluedevil/bluedevil-1.3.2.ebuild
+++ b/net-wireless/bluedevil/bluedevil-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.3.2.ebuild,v 1.4 2013/12/24 12:47:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.3.2.ebuild,v 1.5 2014/01/19 11:15:41 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.kde.org/projects/extragear/base/bluedevil"
 SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/net-wireless/bluez/bluez-4.101-r8.ebuild b/net-wireless/bluez/bluez-4.101-r8.ebuild
index c63f576e1a1a..26f6f8d21fd1 100644
--- a/net-wireless/bluez/bluez-4.101-r8.ebuild
+++ b/net-wireless/bluez/bluez-4.101-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r8.ebuild,v 1.6 2014/01/14 15:10:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r8.ebuild,v 1.7 2014/01/19 10:31:05 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="alsa cups debug gstreamer hid2hci pcmcia readline selinux test-programs usb"
 
 REQUIRED_USE="test-programs? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild
index 3ac8e5ccc21b..abb7c51ec0fa 100644
--- a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild
+++ b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild,v 1.13 2013/03/02 16:11:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.122.0.ebuild,v 1.14 2014/01/19 20:51:42 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A set of version requirements for a CPAN dist"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild
index 4ca098fa8b13..653cfe3c4f86 100644
--- a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild
+++ b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild,v 1.1 2013/09/05 03:45:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.123.0.ebuild,v 1.2 2014/01/19 20:51:42 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A set of version requirements for a CPAN dist"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild
index 1341689c6717..bdf882f633f0 100644
--- a/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild
+++ b/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild,v 1.1 2013/10/28 06:19:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0.ebuild,v 1.2 2014/01/19 20:51:42 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A set of version requirements for a CPAN dist"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/CPAN-Meta-Requirements/Manifest b/perl-core/CPAN-Meta-Requirements/Manifest
index d6878051ff79..7b8b50357a03 100644
--- a/perl-core/CPAN-Meta-Requirements/Manifest
+++ b/perl-core/CPAN-Meta-Requirements/Manifest
@@ -1,4 +1,4 @@
-DIST CPAN-Meta-Requirements-2.121.tar.gz 19188 SHA256 5554e9609ca8a37bdb26450ea6d08534bfb694540a21e3252b0645faffd5bf10
+DIST CPAN-Meta-Requirements-2.121.tar.gz 19188 SHA256 5554e9609ca8a37bdb26450ea6d08534bfb694540a21e3252b0645faffd5bf10 SHA512 72aff2b6a4de42c66d3120b4e1b6a9b30d902bbd684f2055762f0c335af675bd909a4b1bd108a8893889e8ac7c3d28345fff59d3dcdfe6cab6e1faec401429b1 WHIRLPOOL 240ddbd1ba1b6866d3ab4b1b4ff2e68af6223cd54bd9fea7aa6d1d847fb9e2e41bcd12d00353c60d52a9ff20504c99fceeea9b57cfa4dbf2610914588606f5aa
 DIST CPAN-Meta-Requirements-2.122.tar.gz 20710 SHA256 d0399f89f9fecc00f4db1db6222e04d35f86472562b2541d194a5a9f385d02bb SHA512 cd77c003caf870b16c7ab51e99cc15919f4c93487a0bdf33104bed5a1ed3adabadf27f04d69d4a87700f8d01f22d71c6e4401edc8fa1800a3306cac3896c96d5 WHIRLPOOL 4962393ffa3feb7faa709004c0d7fcf2e4af66a102dacdbb31e264aaeddb96b89492ab9edd2fa5791dec3aa4412da8f87b3d6e210a2d0007aef2cc5109061355
 DIST CPAN-Meta-Requirements-2.123.tar.gz 21780 SHA256 1d45c5717aabc669fc7c85d6d12beaf351714ca5aeb46e53c4372650e4ce47b3 SHA512 94821e467ef132eade4018028891ef911af17f54e65eb146d196f6d81180d6e11d775e98dd92870aab1bb9b70311718fd3dd1a0f044007c8eec5421b0564c416 WHIRLPOOL 10d36d7511222653a633bf8315986b60ad50a28410d2509b06f31c31e8657171d1b0c2bc337a5a0d1cb2881f7fa1fd395975811428de07c46d70c4e702a9a6fd
 DIST CPAN-Meta-Requirements-2.125.tar.gz 22320 SHA256 1826828d3430e08c48fd94212a401338f794216112d0035125569439a5cfdab4 SHA512 78fe6237012ed8c4ba06fce2205dbf7d65e26bd9e9ef263aa5329dbce671f1c6630f30b4c443af0ed6d9289c4711d03924bd4bfbdea48d841ec4a3b24e448de4 WHIRLPOOL 842c52a24c2f6f3948d0a9d9c84f3399f2379ee80620a264b935fb775163880063918af091570b4d805519736a514794ff108b4261e4b080dffba65c82cdf46b
diff --git a/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild b/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild
index 007304783263..f3428fe6c9b4 100644
--- a/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild
+++ b/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild,v 1.15 2014/01/17 06:07:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta-YAML/CPAN-Meta-YAML-0.8.0.ebuild,v 1.16 2014/01/19 20:57:23 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read and write a subset of YAML for CPAN Meta files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild
index 379a1514aa0b..bcfb6590e331 100644
--- a/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild
+++ b/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild,v 1.16 2014/01/17 06:07:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.120.921.ebuild,v 1.17 2014/01/19 21:07:24 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The distribution metadata for a CPAN dist"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild
index fddca8a19d41..b58b69efa8ec 100644
--- a/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild
+++ b/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild,v 1.1 2013/08/14 07:28:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.132.140.ebuild,v 1.2 2014/01/19 21:07:24 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The distribution metadata for a CPAN dist"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild b/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild
index 8fbb7b8db2aa..41d0b627fd33 100644
--- a/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild
+++ b/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild,v 1.1 2013/09/09 05:18:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CPAN-Meta/CPAN-Meta-2.132.510.ebuild,v 1.2 2014/01/19 21:07:24 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The distribution metadata for a CPAN dist"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild b/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild
index 9f7a3191a87d..d4376799df1a 100644
--- a/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild
+++ b/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild,v 1.4 2013/12/01 14:43:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Constant/ExtUtils-Constant-0.230.0.ebuild,v 1.5 2014/01/19 08:58:48 pacho Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generate XS code to import C header constants"
 
 SLOT="0"
-KEYWORDS="~amd64 hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild b/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild
index c51de8469281..7da057bd004e 100644
--- a/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild
+++ b/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild,v 1.14 2013/04/20 16:55:50 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Install/ExtUtils-Install-1.540.0.ebuild,v 1.15 2014/01/19 21:08:51 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Install files from here to there"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild
index 3b6d4585c127..ecfbcb455237 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild,v 1.14 2013/04/20 17:00:35 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.640.0.ebuild,v 1.15 2014/01/19 21:09:27 vapier Exp $
 
 EAPI=4
 MODULE_AUTHOR=MSCHWERN
@@ -10,7 +10,7 @@ inherit eutils perl-module
 DESCRIPTION="Create a module Makefile"
 HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild
index 62b41176b31b..4a55b1b826a9 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild,v 1.1 2013/08/14 06:46:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.720.0.ebuild,v 1.2 2014/01/19 21:09:27 vapier Exp $
 
 EAPI=4
 MODULE_AUTHOR=BINGOS
@@ -10,7 +10,7 @@ inherit eutils perl-module
 DESCRIPTION="Create a module Makefile"
 HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild
index 355597f3c6c2..05855dcfd9a0 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild,v 1.1 2013/09/05 04:02:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.740.0.ebuild,v 1.2 2014/01/19 21:09:27 vapier Exp $
 
 EAPI=4
 MODULE_AUTHOR=BINGOS
@@ -10,7 +10,7 @@ inherit eutils perl-module
 DESCRIPTION="Create a module Makefile"
 HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild
index 8527546988b2..b415b56a2953 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild,v 1.2 2013/11/25 18:09:01 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.820.0.ebuild,v 1.3 2014/01/19 21:09:27 vapier Exp $
 
 EAPI=4
 MODULE_AUTHOR=BINGOS
@@ -10,7 +10,7 @@ inherit eutils perl-module
 DESCRIPTION="Create a module Makefile"
 HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild
index 2d7a03d70646..13ebd63b7e0d 100644
--- a/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild
+++ b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild,v 1.14 2013/04/20 16:57:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.610.0.ebuild,v 1.15 2014/01/19 21:08:49 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Utilities to write and check a MANIFEST file"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild
index 9da61de5c976..b087c2502d03 100644
--- a/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild
+++ b/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild,v 1.1 2013/09/09 05:24:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-Manifest/ExtUtils-Manifest-1.630.0.ebuild,v 1.2 2014/01/19 21:08:49 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Utilities to write and check a MANIFEST file"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/File-Spec/File-Spec-3.400.0.ebuild b/perl-core/File-Spec/File-Spec-3.400.0.ebuild
index daa46436177d..71517b85d377 100644
--- a/perl-core/File-Spec/File-Spec-3.400.0.ebuild
+++ b/perl-core/File-Spec/File-Spec-3.400.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-3.400.0.ebuild,v 1.14 2014/01/17 06:09:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-3.400.0.ebuild,v 1.15 2014/01/19 20:30:49 vapier Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Handling files and directories portably"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/File-Temp/File-Temp-0.220.0.ebuild b/perl-core/File-Temp/File-Temp-0.220.0.ebuild
index f3b15a017c03..81c23584ef5b 100644
--- a/perl-core/File-Temp/File-Temp-0.220.0.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.220.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.220.0.ebuild,v 1.2 2012/04/28 02:14:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.220.0.ebuild,v 1.3 2014/01/19 21:03:23 vapier Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/File-Temp/File-Temp-0.230.100.ebuild b/perl-core/File-Temp/File-Temp-0.230.100.ebuild
index 187286f5a2d2..eb327cf6c907 100644
--- a/perl-core/File-Temp/File-Temp-0.230.100.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.230.100.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.100.ebuild,v 1.1 2013/08/24 03:43:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.100.ebuild,v 1.2 2014/01/19 21:03:23 vapier Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/File-Temp/File-Temp-0.230.400.ebuild b/perl-core/File-Temp/File-Temp-0.230.400.ebuild
index 75e194357d0e..4d8cc17dd21f 100644
--- a/perl-core/File-Temp/File-Temp-0.230.400.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.230.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.400.ebuild,v 1.3 2013/12/08 19:55:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.400.ebuild,v 1.4 2014/01/19 21:03:23 vapier Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/IO/IO-1.25.ebuild b/perl-core/IO/IO-1.25.ebuild
index 02bf43256759..755278f4bfbf 100644
--- a/perl-core/IO/IO-1.25.ebuild
+++ b/perl-core/IO/IO-1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/IO/IO-1.25.ebuild,v 1.19 2013/02/19 00:01:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IO/IO-1.25.ebuild,v 1.20 2014/01/19 21:05:26 vapier Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="load various IO modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild b/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild
index a2139e2b1c68..755658739371 100644
--- a/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild
+++ b/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild,v 1.12 2012/05/15 19:15:01 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.272.0.ebuild,v 1.13 2014/01/19 20:53:53 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS compatible pure-Perl module"
 
 SLOT="0"
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!!<dev-perl/JSON-2.50"
diff --git a/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild b/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild
index 1c35583f0324..92954e6c6237 100644
--- a/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild
+++ b/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild,v 1.1 2013/03/13 08:17:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/JSON-PP/JSON-PP-2.272.20.ebuild,v 1.2 2014/01/19 20:53:53 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS compatible pure-Perl module"
 
 SLOT="0"
-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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!!<dev-perl/JSON-2.50"
diff --git a/perl-core/JSON-PP/Manifest b/perl-core/JSON-PP/Manifest
index a0afb7ff7d8a..5b9eb73840cd 100644
--- a/perl-core/JSON-PP/Manifest
+++ b/perl-core/JSON-PP/Manifest
@@ -1,4 +1,4 @@
 DIST JSON-PP-2.27104.tar.gz 41350 SHA256 f49c8725ea2735473cf27333a7e3ca2e4ef8c8d70da610f8e567e4a261d865ab
-DIST JSON-PP-2.27105.tar.gz 41266 SHA256 7a2e5ed0f23dbe6ed5fb46a032c7d8b912c65dce8d1482763f7feda7151de6fe
+DIST JSON-PP-2.27105.tar.gz 41266 SHA256 7a2e5ed0f23dbe6ed5fb46a032c7d8b912c65dce8d1482763f7feda7151de6fe SHA512 3a0d081ea7af7a6e793e616c99ab6ca064ccd8ff89360fbaba4fc27c71a5d9bffc811b3d21967bb4f3669d6b2f260245e568075d734cf0e85bfecb6b9779a20a WHIRLPOOL b7f18d6c8e2d454de5888b072db00bbf793e7c56ab76fe68902c8671e2c0240a095cabb4869937d262a2f3b2171053be5218c32e9c005ba68ca7af32d1557d93
 DIST JSON-PP-2.27200.tar.gz 41571 SHA256 035e11154bdee7908842a30f4150f47fb9d0d696e56a27947fe2b8a479cc69d3 SHA512 a00ca10ac2c79a29592b72151510044c6e1c36ab216e0d7472991ad37b7e28dba01e2fd062d64a329341011404249d112867c68ab5aef2a0781c3d81b7592c8e WHIRLPOOL 5f590285537d9553b51a5e03aa4d467f25e02cb1deb216eb5628db39d53686fb03a99990047dafff07bb4ddc146297953473baf5cdf7ee6aad53ed0631a9f957
 DIST JSON-PP-2.27202.tar.gz 41076 SHA256 3ec0a78d1049db7f58449c28b69349834f8a9623190acbf041a709f184527eb3 SHA512 e8374a30e107f02c1226d33fb5cf063142a9c26445fed0acf0d56de901b4be007af75f1a90578568d0eb25301c8ee5eb963a7b29b6dcd4bad421d980b485d211 WHIRLPOOL 88c5c66b61b7af4569d5cdd17a2e4c6143f8435f6a8309017880680f74d4a12cf970b022203e2200b5d0d11ea5970cd2a6beb3ede712db44b27ae20344ac57f7
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild
index 7a1ebb702626..ba3a303f9a78 100644
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild,v 1.14 2013/03/02 16:20:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.400.ebuild,v 1.15 2014/01/19 21:01:28 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild
index a5121b589bb1..fdec587fce5e 100644
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild,v 1.1 2013/08/14 07:42:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.500.ebuild,v 1.2 2014/01/19 21:01:28 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild
index 2dc2e378f455..8b892ece691b 100644
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild,v 1.1 2013/09/13 04:47:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.700.ebuild,v 1.2 2014/01/19 21:01:28 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild
index dcb0466d5b4e..19d00ff446f1 100644
--- a/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild
+++ b/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild,v 1.1 2013/10/28 06:01:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Parse-CPAN-Meta/Parse-CPAN-Meta-1.440.900.ebuild,v 1.2 2014/01/19 21:01:28 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse META.yml and other similar CPAN metadata files"
 
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild
index 9fc14481debe..93c1f5c23e9b 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild,v 1.14 2014/01/17 06:11:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.270.0.ebuild,v 1.15 2014/01/19 20:48:40 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild
index 410263f5d9fc..4e37c7c00c89 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild,v 1.1 2013/08/14 07:45:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.300.0.ebuild,v 1.2 2014/01/19 20:48:40 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild
index 0f22993e2bfc..741fef2abfc9 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild,v 1.1 2013/08/24 03:57:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.310.0.ebuild,v 1.2 2014/01/19 20:48:40 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild
index d3427793c38b..fac21795b494 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild,v 1.1 2013/09/05 03:38:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.320.0.ebuild,v 1.2 2014/01/19 20:48:40 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild
index 6d5cfd432c38..78309d1437bf 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild,v 1.1 2013/10/28 06:23:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.350.0.ebuild,v 1.2 2014/01/19 20:48:40 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Socket/Socket-2.9.0.ebuild b/perl-core/Socket/Socket-2.9.0.ebuild
index 26318e8403d5..c8b5dae8ba0e 100644
--- a/perl-core/Socket/Socket-2.9.0.ebuild
+++ b/perl-core/Socket/Socket-2.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Socket/Socket-2.9.0.ebuild,v 1.3 2013/12/01 14:44:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Socket/Socket-2.9.0.ebuild,v 1.4 2014/01/19 08:59:56 pacho Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Networking constants and support functions"
 
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/perl-core/Test-Simple/Manifest b/perl-core/Test-Simple/Manifest
index fa01e789d275..49cd27a6fd0b 100644
--- a/perl-core/Test-Simple/Manifest
+++ b/perl-core/Test-Simple/Manifest
@@ -1,4 +1,4 @@
-DIST Test-Simple-0.94.tar.gz 106635 SHA256 6f93a4f758ac99bcaa2f917bf10493f6eb102b1ab769d57f5d5cafd6bf4aaee9
-DIST Test-Simple-0.96.tar.gz 105888 SHA256 2fe35677a0e98598105425146e1338f4a341585e3236426bd680117400331490
+DIST Test-Simple-0.94.tar.gz 106635 SHA256 6f93a4f758ac99bcaa2f917bf10493f6eb102b1ab769d57f5d5cafd6bf4aaee9 SHA512 37f7a543a5cf9103328955abd35845e58f390d140b2c1437b0a217078b5299ca1c46779d5d5863ab2869ab3105574499d06e9a252beb8e2a7869d3a8ef91e271 WHIRLPOOL 93a904cc6536fb5267739ce1c8f6262dea18d75fb910ead85eb7fabca99421754f227070da34c1d6f9c409ce887d3828325e8033057fae5be5587a6cd6e6f160
+DIST Test-Simple-0.96.tar.gz 105888 SHA256 2fe35677a0e98598105425146e1338f4a341585e3236426bd680117400331490 SHA512 c8a68e65a2066a7da7a723e94b20a1614e1ae2290c90d0ec6f5d20511f8bd9349b6e19cf00fb5b846370271ee10ead3e8e90c6e62de2ab68d47186b14062eb47 WHIRLPOOL 6138818a4b343f538dc62892ad6e438ea915bd28c84833d6ced859cb7737a338767d24e6c1954f51e9724d266022393444372954c6a41beaf283e9b5d2dd58e1
 DIST Test-Simple-0.98.tar.gz 107255 SHA256 2fb203e2cb75e72c6f70af71c6b01998f2c0ec2afba6c38cc5053c6107cd12a8 SHA512 bc6147526837afac1d8c33d3318d179ae387246e2083e7e284bae10822fd0150a848bd6c6df8c923a11306116925234da154d5ca155af2757eb7b565b7c84283 WHIRLPOOL 15da9b86a2067168372a5d0e321d719a9011d342e742ff8204212309330ddec8e7d381de3af22ee93ec3ac0ae5c56feb2e0befa7b2a00d8b7fd85b2803d140ca
 DIST Test-Simple-0.98_05.tar.gz 111892 SHA256 bc70e8f3cab9a28a8ecbc4299f1703c7c5529c5b22222c28689dd89127f947a2 SHA512 ca4a77a5e5841ab6fb5d5ec8ff7bca6ec244c75ae267a6d85e8340204f109eb35ccc2fab1f30d06d2a98d2dd7687b7d908fcfad12041c15cdd4d1133a7359e5f WHIRLPOOL 401bca11acc22545c6044141065c57169817ac1c3a3ae207661e828f6269914ead8758aa5db578f6ce4d0e65e3c6134d755df5a34af0094b526d00595754baeb
diff --git a/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild b/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
index 2858b04a486e..9a138cd2b72e 100644
--- a/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild,v 1.9 2012/10/16 14:33:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild,v 1.10 2014/01/19 21:07:02 vapier Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Basic utilities for writing tests"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild b/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild
index 5f62efb7a6f5..647c24d52501 100644
--- a/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild,v 1.1 2013/08/14 06:15:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.980.5.ebuild,v 1.2 2014/01/19 21:07:02 vapier Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Basic utilities for writing tests"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/version/version-0.990.100.ebuild b/perl-core/version/version-0.990.100.ebuild
index 5d1def5093da..f5ee0905a9bb 100644
--- a/perl-core/version/version-0.990.100.ebuild
+++ b/perl-core/version/version-0.990.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.100.ebuild,v 1.14 2014/01/17 06:12:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.100.ebuild,v 1.15 2014/01/19 20:51:02 vapier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for Version Objects"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/version/version-0.990.200.ebuild b/perl-core/version/version-0.990.200.ebuild
index 92b4c494e2f5..ac5efb19da4e 100644
--- a/perl-core/version/version-0.990.200.ebuild
+++ b/perl-core/version/version-0.990.200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.200.ebuild,v 1.1 2013/03/13 07:39:00 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.200.ebuild,v 1.2 2014/01/19 20:51:02 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for Version Objects"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/version/version-0.990.300.ebuild b/perl-core/version/version-0.990.300.ebuild
index 0490378cdbfe..28f36526fef2 100644
--- a/perl-core/version/version-0.990.300.ebuild
+++ b/perl-core/version/version-0.990.300.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.300.ebuild,v 1.1 2013/08/24 03:47:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.300.ebuild,v 1.2 2014/01/19 20:51:02 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for Version Objects"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/version/version-0.990.400.ebuild b/perl-core/version/version-0.990.400.ebuild
index d74bf2894614..02f34336debf 100644
--- a/perl-core/version/version-0.990.400.ebuild
+++ b/perl-core/version/version-0.990.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.400.ebuild,v 1.1 2013/09/18 02:50:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/version/version-0.990.400.ebuild,v 1.2 2014/01/19 20:51:02 vapier Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for Version Objects"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index c6471affa61c..d1a06b1007ab 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -74,7 +74,16 @@ prelude
 mssql
 
 # havent tested yet
+bazaar
+darcs
+mercurial
+kerberos
+gpg
+gnome
+gnome-keyring
 cupsddk
+doc
+emacs
 gphoto2
 mythtv
 afs
@@ -130,6 +139,16 @@ gts
 anthy
 ace
 csharp
+icu
+gtk
+qt4
+qt5
+R
+sdl
+slang
+tk
+vim-syntax
+X
 
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index bf1f8f7aa532..759435bf5c8a 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,8 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.134 2014/01/11 08:36:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.135 2014/01/19 19:59:41 pacho Exp $
 
-# Pacho Ramos <pacho@gentoo.org> (11 Jan 2013)
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)  
+# Missing keywords, bug #478254
+gnome-base/gnome classic
+
+# Pacho Ramos <pacho@gentoo.org> (11 Jan 2014)
 sys-kernel/dracut -dracut_modules_systemd
 
 # Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index bb2c862fb05f..e69de29bb2d1 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,6 +0,0 @@
-# Pacho Ramos <pacho@gentoo.org> (27 Dec 2013)      
-# 3.6 is not supported for a long time and prone to bugs
-# and security issues (#496166), until systemd is keyworded
-# (#478076) we have no other option.
-gnome-base/gnome-settings-daemon openrc-force
-gnome-base/gnome-shell openrc-force
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index b46d6aa19aca..908e2bba7a3d 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.153 2013/12/27 20:49:04 pacho Exp $
-
-# Pacho Ramos <pacho@gentoo.org> (27 Dec 2013)      
-# 3.6 is not supported for a long time and prone to bugs
-# and security issues (#496166), until systemd is keyworded
-# (#478076) we have no other option.
-gnome-base/gnome-settings-daemon -openrc-force
-gnome-base/gnome-shell -openrc-force
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.155 2014/01/19 19:59:41 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)  
+# Missing keywords, bug #478254
+gnome-base/gnome classic
+
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2013)  
+sys-kernel/dracut -dracut_modules_systemd 
 
 # Pacho Ramos <pacho@gentoo.org> (02 Dec 2013)        
 # Missing keywords, bug #493156
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index c59ae9c3b322..90ff2083a05e 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.114 2013/11/10 15:48:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.115 2014/01/19 19:23:51 pacho Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
@@ -121,7 +121,6 @@ barcode
 xmms2
 gme
 aacplus
-systemd
 soundcloud
 devil
 gts
@@ -339,3 +338,7 @@ unwind
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (10 Nov 2013)
 # sys-devel/llvm is not keyworded, bug #320221
 llvm
+
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)
+# Unmask systemd since it is keyworded here.  
+-systemd
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 0f58bf088bd4..5a01456363d5 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.61 2013/12/29 14:28:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.62 2014/01/19 19:12:11 swift Exp $
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
 #  on behalf of QA team <qa@gentoo.org
@@ -56,6 +56,7 @@ sec-policy/selinux-bind
 sec-policy/selinux-bitlbee
 sec-policy/selinux-bluetooth
 sec-policy/selinux-brctl
+sec-policy/selinux-cachefilesd
 sec-policy/selinux-calamaris
 sec-policy/selinux-canna
 sec-policy/selinux-ccs
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/13.0/desktop/kde/systemd/parent b/profiles/default/linux/sparc/13.0/desktop/kde/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/desktop/kde/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/13.0/eapi b/profiles/default/linux/sparc/13.0/eapi
index 0cfbf08886fc..7ed6ff82de6b 100644
--- a/profiles/default/linux/sparc/13.0/eapi
+++ b/profiles/default/linux/sparc/13.0/eapi
@@ -1 +1 @@
-2
+5
diff --git a/profiles/default/linux/sparc/13.0/use.stable.mask b/profiles/default/linux/sparc/13.0/use.stable.mask
new file mode 100644
index 000000000000..b034ecac6628
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/use.stable.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/use.stable.mask,v 1.1 2014/01/19 19:23:51 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)
+# systemd is not stable on this arch
+systemd
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 2c945d2cd3bb..ea6eb06abb78 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.49 2013/12/29 14:28:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.50 2014/01/19 19:13:10 swift Exp $
 
 # Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
 # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
@@ -54,6 +54,7 @@
 -sec-policy/selinux-bitlbee
 -sec-policy/selinux-bluetooth
 -sec-policy/selinux-brctl
+-sec-policy/selinux-cachefilesd
 -sec-policy/selinux-calamaris
 -sec-policy/selinux-canna
 -sec-policy/selinux-ccs
diff --git a/profiles/package.mask b/profiles/package.mask
index 37a0204e91f6..0c8d5e33d96d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15351 2014/01/19 07:26:20 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15354 2014/01/20 08:31:45 kensington Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Christian Ruppert <idl0r@gentoo.org> (19 Jan 2014)
+# Experimental, for now
+=dev-vcs/gitolite-gentoo-3*
+
 # Dion Moult <moult@gentoo.org> (19 Jan 2014)
 # Mask for removal in 30 days. Packages now depend on dev-lang/mono directly and
 # not on virtual/monodoc (bug #471180)
@@ -409,16 +413,6 @@ games-emulation/mupen64plus-video-glide64mk2
 games-emulation/mupen64plus-video-rice
 games-emulation/m64py
 
-# Johannes Huber <johu@gentoo.org> (14 Dec 2013)
-# Masked for removal in 30 days. Not packaged in current
-# stable KDE SC 4.11 and later.
-kde-base/kdegraphics-strigi-analyzer
-kde-base/kdesdk-misc
-kde-base/kdesdk-scripts
-kde-base/kstartperf
-kde-base/kuiviewer
-kde-base/solid
-
 # Ben de Groot <yngwin@gentoo.org> (08 Dec 2013)
 # New header location breaks compilation of reverse dependencies,
 # see tracker bug #493570
@@ -1066,7 +1060,6 @@ sys-auth/pam_keystore
 # per QA team policy, all these need to be kept masked by default, if
 # available in the tree.
 ~app-doc/devmanual-9999
-~app-editors/emacs-vcs-24.3.9999
 =app-forensics/openscap-9999
 ~app-i18n/skk-jisyo-9999
 =app-misc/mc-9999
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index be751a86e7a4..1d2f9a525acd 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -141,7 +141,9 @@ sh              default/linux/sh/13.0/developer                 dev
 sparc           default/linux/sparc/13.0                        stable
 sparc           default/linux/sparc/13.0/desktop                stable
 sparc           default/linux/sparc/13.0/desktop/gnome          stable
+sparc		default/linux/sparc/13.0/desktop/gnome/systemd  stable
 sparc           default/linux/sparc/13.0/desktop/kde            stable
+sparc		default/linux/sparc/13.0/desktop/kde/systemd    stable
 sparc           default/linux/sparc/13.0/developer              stable
 
 # x86 Profiles
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 66a8e81f4cd3..9d404e3b7913 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -7,7 +7,7 @@ cpan		http://search.cpan.org/CPAN http://www.cpan.org
 cran		http://cran.au.r-project.org http://cran.r-project.org http://cran.us.r-project.org
 debian		http://ftp.au.debian.org/debian http://ftp.at.debian.org/debian http://ftp.be.debian.org/debian http://ftp.ba.debian.org/debian http://ftp.br.debian.org/debian http://ftp.bg.debian.org/debian http://ftp.ca.debian.org/debian http://ftp.cl.debian.org/debian http://ftp.hr.debian.org/debian http://ftp.cz.debian.org/debian http://ftp.dk.debian.org/debian http://ftp.ee.debian.org/debian http://ftp.fi.debian.org/debian http://ftp.fr.debian.org/debian http://ftp2.fr.debian.org/debian http://ftp.de.debian.org/debian http://ftp2.de.debian.org/debian http://ftp.uk.debian.org/debian http://ftp.gr.debian.org/debian http://ftp.hk.debian.org/debian http://ftp.hu.debian.org/debian http://ftp.is.debian.org/debian http://ftp.ie.debian.org/debian http://ftp.it.debian.org/debian http://ftp.jp.debian.org/debian http://ftp2.jp.debian.org/debian http://ftp.kr.debian.org/debian http://ftp.mx.debian.org/debian http://ftp.nl.debian.org/debian http://ftp.nc.debian.org/debian http://ftp.nz.debian.org/debian http://ftp.no.debian.org/debian http://ftp.pl.debian.org/debian http://ftp.pt.debian.org/debian http://ftp.ro.debian.org/debian http://ftp.ru.debian.org/debian http://ftp.sk.debian.org/debian http://ftp.si.debian.org/debian http://ftp.es.debian.org/debian http://ftp.se.debian.org/debian http://ftp.ch.debian.org/debian http://ftp.tw.debian.org/debian http://ftp.th.debian.org/debian http://ftp.tr.debian.org/debian http://ftp.ua.debian.org/debian http://ftp.us.debian.org/debian
 fedora-dev	http://mirror.aarnet.edu.au/pub/fedora/linux http://mirror.internode.on.net/pub/fedora/linux http://mirror.pacific.net.au/linux/fedora/linux http://ftp.belnet.be/linux/fedora/linux http://gulus.usherbrooke.ca/pub/distro/fedora/linux http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux http://ftp.fi.muni.cz/pub/linux/fedora/linux http://mirror.karneval.cz/pub/linux/fedora/linux http://ftp-stud.hs-esslingen.de/pub/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora/linux http://ftp.uni-bayreuth.de/linux/fedora/linux ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux http://www.jur-linux.org/download/fedora http://ftp.crc.dk/fedora/linux ftp://ftp.crc.dk/pub/mirrors/fedora/linux http://ftp.cica.es/fedora/linux http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux http://mirrors.ircam.fr/pub/fedora/linux ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora http://fr2.rpmfind.net/linux/fedora ftp://ftp.ciril.fr/pub/linux/fedora/linux http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.otenet.gr/pub/linux/fedora/linux http://ftp.rhnet.is/pub/fedora/linux http://ftp.iij.ad.jp/pub/linux/fedora http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux ftp://ftp.tudelft.nl/pub/Linux/download.fedora.redhat.com/linux ftp://alviss.et.tudelft.nl/pub/fedora/linux ftp://ftp.pbone.net/pub/fedora/linux http://ftp.ps.pl/pub/Linux/fedora-linux http://sunsite.icm.edu.pl/pub/Linux/fedora/linux http://mirror.yandex.ru/fedora/linux http://ftp.chg.ru/pub/Linux/fedora/linux http://ftp.upjs.sk/pub/fedora/linux ftp://ftp.linux.org.tr/pub/fedora/linux http://fedora.mirror.iweb.ca http://limestone.uoregon.edu/ftp/fedora/linux ftp://limestone.uoregon.edu/fedora/linux ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux http://mirror.cc.vt.edu/pub/fedora/linux http://mirrors.kernel.org/fedora ftp://ftp.applios.net/pub/fedora/linux http://mirror.linux.duke.edu/pub/fedora/linux http://mirror.hiwaay.net/pub/fedora/linux http://linux.nssl.noaa.gov/fedora/linux http://www.gtlib.gatech.edu/pub/fedora.redhat/linux ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux http://ftp.linux.ncsu.edu/pub/fedora/linux http://kdeforge.unl.edu/mirrors/fedora/linux http://mirrors.cat.pdx.edu/fedora/linux http://mirrors.usc.edu/pub/linux/distributions/fedora/linux ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux ftp://fedora.bu.edu http://fedora.mirrors.tds.net/pub/fedora
-fedora		ftp://ftp.uni-klu.ac.at/linux/fedora/linux/core http://fedora.inode.at ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/extras http://ftp.univie.ac.at/systems/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora/extras http://ftp.univie.ac.at/systems/linux/fedora http://ftp.netcraft.com.au/pub/fedora/linux/core http://ftp.netcraft.com.au/pub/fedora/linux http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/fedora/linux/core http://mirror.pacific.net.au/linux/fedora/linux/extras http://mirror.pacific.net.au/linux/fedora/linux http://mirror.pacific.net.au/linux/fedora/epel http://mirror.aarnet.edu.au/pub/fedora/linux/core http://mirror.aarnet.edu.au/pub/fedora/linux/extras http://mirror.aarnet.edu.au/pub/fedora/linux http://public.www.planetmirror.com/pub/fedora/linux/core http://public.planetmirror.com/pub/fedora/linux/extras http://public.www.planetmirror.com/pub/fedora/linux http://mirror.optus.net/fedora/linux/core http://mirror.optus.net/fedora/linux/extras http://mirror.optus.net/fedora/linux http://mirror.internode.on.net/pub/fedora/linux/core http://mirror.internode.on.net/pub/fedora/linux/extras http://mirror.internode.on.net/pub/fedora/linux http://ftp.belnet.be/linux/fedora/linux/core http://ftp.belnet.be/linux/fedora/linux/extras http://ftp.belnet.be/linux/fedora/linux http://mirrors.evrocom.net/fedora/linux/core ftp://mirrors.evrocom.net/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.muug.mb.ca/pub/fedora/linux/extras ftp://ftp.muug.mb.ca/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux ftp://ftp.muug.mb.ca/pub/fedora/linux http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/extras ftp://ftp.telus.net/pub/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/extras ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/extras http://gulus.usherbrooke.ca/pub/distro/fedora/linux http://fedora.arcticnetwork.ca/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/extras ftp://mirror.switch.ch/mirror/fedora/linux/extras http://mirror.switch.ch/ftp/mirror/fedora/linux ftp://mirror.switch.ch/mirror/fedora/linux ftp://ftp.solnet.ch/mirror/fedora/linux/core ftp://ftp.solnet.ch/mirror/fedora/linux ftp://ftp.telmexchile.cl/Unix/fedora/linux/core ftp://ftp.telmexchile.cl/Unix/fedora/linux/extras http://fedora.candishosting.com.cn/pub/fedora/linux http://mirrors.cytanet.com.cy/linux/fedora/linux http://ftp.sh.cvut.cz/MIRRORS/fedora http://ftp.sh.cvut.cz/MIRRORS/fedora-extras http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/extras http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux http://ftp.linux.cz/pub/linux/fedora-core http://ftp.linux.cz/pub/linux/fedora/linux/extras http://ftp.fi.muni.cz/pub/linux/fedora/linux http://ftp1.skynet.cz/pub/linux/fedora/core http://ftp1.skynet.cz/pub/linux/fedora/extras http://ftp1.skynet.cz/pub/linux/fedora http://mirror.karneval.cz/pub/linux/fedora/linux/core http://mirror.karneval.cz/pub/linux/fedora/linux/extras http://mirror.karneval.cz/pub/linux/fedora/linux http://mirror.karneval.cz/pub/linux/fedora/epel http://sunsite.informatik.rwth-aachen.de/cgi-bin/ftp.new/ftpshow/pub/Linux/fedora/linux http://ftp-stud.hs-esslingen.de/pub/fedora/linux/extras http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core http://ftp-stud.hs-esslingen.de/pub/fedora/linux http://ftp.stw-bonn.de/pub/fedora/linux/core http://ftp.stw-bonn.de/pub/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-core http://fedora.tu-chemnitz.de/pub/linux/fedora-core-extras http://fedora.tu-chemnitz.de/pub/linux/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-epel http://mirror.atrpms.net/fedora/linux/core http://mirror.atrpms.net/fedora/linux/extras http://mirror.atrpms.net/fedora/linux http://ftp.informatik.uni-frankfurt.de/fedora/core ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/core http://ftp.informatik.uni-frankfurt.de/fedora/extras ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/extras http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux/core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core http://ftp.uni-bayreuth.de/linux/fedora/linux/extras ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux ftp://ftp.fu-berlin.de/linux/fedora/core ftp://ftp.fu-berlin.de/linux/fedora/extras http://ftp.uni-koeln.de/mirrors/fedora/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/extras http://www.jur-linux.org/download/fedora/core http://www.jur-linux.org/download/fedora http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/core http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/extras http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux http://mirror.fraunhofer.de/download.fedora.redhat.com/epel ftp://klid.dk/fedora/linux/core http://ftp.crc.dk/fedora/linux/core ftp://ftp.crc.dk/pub/mirrors/fedora/linux/core http://ftp.crc.dk/fedora/linux/extras ftp://ftp.crc.dk/pub/mirrors/fedora/linux/extras http://ftp.crc.dk/fedora/linux ftp://ftp.crc.dk/pub/mirrors/fedora/linux http://ftp.crc.dk/fedora-epel ftp://ftp.crc.dk/pub/mirrors/fedora-epel http://redhat.linux.ee/pub/fedora/linux/core http://ftp.linux.ee/pub/fedora/linux http://ftp.udl.es/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/extras http://ftp.udl.es/pub/fedora/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/core http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/extras http://ftp.gui.uva.es/sites/fedora.redhat.com/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/epel http://distribuciones.telecable.es/fedora http://ftp.caliu.info/pub/distribucions/fedora http://ftp.cica.es/fedora/linux/core http://ftp.cica.es/fedora/linux/extras http://ftp.cica.es/fedora/linux http://sunsite.rediris.es/mirror/fedora-redhat/core ftp://ftp.rediris.es/mirror/fedora-redhat/core http://sunsite.rediris.es/mirror/fedora-extras ftp://ftp.rediris.es/mirror/fedora-extras http://sunsite.rediris.es/mirror/fedora-redhat ftp://ftp.rediris.es/mirror/fedora-redhat http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/core http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/extras http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/linux/core http://mirrors.ircam.fr/pub/fedora/linux/extras http://mirrors.ircam.fr/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/epel http://fr.rpmfind.net/linux/fedora/core http://fr.rpmfind.net/linux/fedora/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux ftp://ftp.redhat.ikoula.com/fedora http://fr2.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/extras http://fr2.rpmfind.net/linux/fedora ftp://ftp.ciril.fr/pub/linux/fedora/linux/core ftp://ftp.ciril.fr/pub/linux/fedora/linux ftp://ftp.cru.fr/pub/linux/fedora/core ftp://ftp.cru.fr/pub/linux/fedora/extras ftp://ftp.cru.fr/pub/linux/fedora http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.univ-pau.fr/pub/mirrors/fedora ftp://ftp.uvsq.fr/pub/fedora ftp://ftp.lip6.fr/pub/linux/distributions/fedora http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel http://ftp.ntua.gr/pub/linux/fedora/linux/core http://ftp.ntua.gr/pub/linux/fedora/linux/extras http://ftp.ntua.gr/pub/linux/fedora/linux ftp://ftp.otenet.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux ftp://ftp.ceid.upatras.gr/pub/fedora/linux http://ftp.hostrino.com/pub/fedora/linux/core http://ftp.hostrino.com/pub/fedora/linux http://download.stmc.edu.hk/fedora/linux/core ftp://ftp2.surplux.net/pub/fedora ftp://ftp.tvnet.hu/pub/fedora/linux/core ftp://ftp.tvnet.hu/pub/fedora/linux http://ftp.esat.net/pub/linux/fedora http://ftp.esat.net/mirrors/download.fedora.redhat.com/pub/fedora/linux/core http://ftp.esat.net/mirrors/download.fedora.redhat.com/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/core http://ftp.heanet.ie/pub/fedora/linux/extras http://ftp.heanet.ie/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/epel http://ftp.rhnet.is/pub/fedora/linux/core http://ftp.rhnet.is/pub/fedora/linux/extras http://ftp.rhnet.is/pub/fedora/linux http://ftp.unina.it/pub/linux/distributions/fedora http://fedora.fastbull.org http://fedora.mirror.garr.it/mirrors/fedora/linux/core http://fedora.mirror.garr.it/mirrors/fedora/linux/extras http://fedora.mirror.garr.it/mirrors/fedora/linux http://ftp.riken.jp/Linux/fedora/core http://ftp.riken.jp/Linux/fedora/extras http://ftp.riken.jp/Linux/fedora/epel http://ftp.riken.jp/Linux/fedora http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core http://ftp.nara.wide.ad.jp/pub/Linux/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora/core http://ftp.kddilabs.jp/Linux/packages/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora http://ftp.kddilabs.jp/Linux/packages/fedora/epel http://ftp.iij.ad.jp/pub/linux/fedora/core http://ftp.iij.ad.jp/pub/linux/fedora/extras http://ftp.iij.ad.jp/pub/linux/fedora http://ftp.iij.ad.jp/pub/linux/fedora/epel http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/extras http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/epel ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://ftp.kaist.ac.kr/pub/fedora/linux/core ftp://ftp.kaist.ac.kr/fedora/linux/core http://ftp.kaist.ac.kr/pub/fedora/linux/extras ftp://ftp.kaist.ac.kr/fedora/linux/extras http://ftp.kaist.ac.kr/pub/fedora/linux ftp://ftp.kaist.ac.kr/fedora/linux http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/core http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/extras ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/extras http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux http://fedora.ifc.unam.mx/core ftp://mirror.ifc.unam.mx/fedora/core http://fedora.ifc.unam.mx ftp://mirror.ifc.unam.mx/fedora ftp://fedora.namibia.na/pub/fedora ftp://fedora.namibia.na/fedora/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux ftp://ftp.easynet.nl/mirror/fedora ftp://ftp.easynet.nl/mirror/fedora/extras ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/extras http://mirror.hosting-concepts.com/pub/os/linux/fedora ftp://ftp.tudelft.nl/pub/Linux/download.fedora.redhat.com/linux ftp://alviss.et.tudelft.nl/pub/fedora/linux/core ftp://alviss.et.tudelft.nl/pub/fedora/linux/extras ftp://alviss.et.tudelft.nl/pub/fedora/linux ftp://ftp.uib.no/pub/fedora/linux/core ftp://ftp.uib.no/pub/fedora/linux/extras ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.pbone.net/pub/fedora/linux/core ftp://ftp.pbone.net/pub/fedora/linux/extras ftp://ftp.pbone.net/pub/fedora/linux ftp://ftp.tpnet.pl/d17/fedora http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/extras http://ftp.pwr.wroc.pl/pub/linux/fedora/linux http://ftp.ps.pl:/pub/linux/fedora-core http://ftp.ps.pl:/pub/linux/fedora-extras http://ftp.ps.pl/pub/Linux/fedora-epel http://ftp.ps.pl/pub/Linux/fedora-linux ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/extras ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/epel http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/extras http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com http://ftp.idilis.ro/mirrors/fedora/core http://ftp.gts.lug.ro/fedora/linux/core http://ftp.gts.lug.ro/fedora/linux/extras http://ftp.gts.lug.ro/fedora/linux http://mirror.etf.bg.ac.yu/fedora ftp://ftp.anders.ru/pub/Linux/fedora/linux/core http://mirror.yandex.ru/fedora/linux/core http://mirror.yandex.ru/fedora/linux/extras http://mirror.yandex.ru/fedora/linux http://ftp.chg.ru/pub/Linux/fedora/linux/core http://ftp.chg.ru/pub/Linux/fedora/linux/extras http://ftp.chg.ru/pub/Linux/fedora/linux http://ftp.rhd.ru/pub/fedora/linux/core http://ftp.rhd.ru/pub/fedora/linux/extras ftp://ftp.rhd.ru/pub/fedora/linux http://ftp.sunet.se/pub/Linux/distributions/fedora http://ftp.port80.se/fedora/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/extras ftp://falkor.skane.se/pub/mirrors/fedora/core ftp://falkor.skane.se/pub/mirrors/fedora/linux ftp://ftp.oss.eznetsols.org/linux/fedora ftp://ftp.bevc.net/mirrors/fedora http://mirrors.bevc.net/fedora http://ftp.upjs.sk/pub/fedora/linux/core http://ftp.upjs.sk/pub/fedora/linux/extras http://ftp.upjs.sk/pub/fedora/linux ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/core ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/extras ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux http://ftp.mirror.tw/pub/fedora/linux/core ftp://fedora.org.ua/pub/linux/fedora http://ftp.tlk-l.net/pub/mirrors/fedora/core http://ftp.tlk-l.net/pub/mirrors/fedora/extras http://ftp.tlk-l.net/pub/mirrors/fedora http://ftp.usf.edu/pub/fedora/linux/core http://ftp.usf.edu/pub/fedora/linux http://fedora.mirror.iweb.ca/core http://fedora.mirror.iweb.ca/extras http://fedora.mirror.iweb.ca http://limestone.uoregon.edu/ftp/fedora ftp://limestone.uoregon.edu/fedora http://limestone.uoregon.edu/ftp/fedora/extras ftp://limestone.uoregon.edu/fedora/extras http://limestone.uoregon.edu/ftp/fedora/linux ftp://limestone.uoregon.edu/fedora/linux http://fedora.secsup.org/linux/core ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux/core http://fedora.secsup.org/linux ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux http://distro.ibiblio.org/pub/linux/distributions/fedora/linux http://mirrors.tiatera.com/fedora/core http://mirrors.tiatera.com/fedora/extras http://mirrors.tiatera.com/fedora/linux http://ftp.linux.ncsu.edu/pub/fedora/linux/core http://ftp.linux.ncsu.edu/pub/fedora/linux/extras http://ftp.linux.ncsu.edu/pub/fedora/linux ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/extras ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/core http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/extras http://mirrors.usc.edu/pub/linux/distributions/fedora/linux ftp://mirror.nyi.net/fedora/linux/core ftp://mirror.nyi.net/fedora/linux ftp://fedora.bu.edu/core ftp://fedora.bu.edu/extras ftp://fedora.bu.edu http://mirror.anl.gov/pub/fedora/linux/core http://mirror.anl.gov/pub/fedora/linux ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/extras ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux http://mirror.stanford.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora http://mirror.stanford.edu/fedora/linux ftp://mirror.stanford.edu/pub/mirrors/fedora/linux http://coblitz.planet-lab.org/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/extras http://mirror.cc.vt.edu/pub/fedora/linux http://mirrors.cat.pdx.edu/fedora/linux/core http://mirrors.cat.pdx.edu/fedora/linux/extras http://mirrors.cat.pdx.edu/fedora/linux http://mirrors.cat.pdx.edu/fedora/epel http://fedora.omnispring.com/core http://fedora.omnispring.com/extras http://ftp.ale.org/pub/fedora/linux/core ftp://ftp.ale.org/mirrors/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux ftp://ftp.webtrek.com/pub/mirrors/fedora http://ftp.ndlug.nd.edu/pub/fedora/linux/core http://mirrors.kernel.org/fedora/core http://mirrors.kernel.org/fedora/extras http://mirrors.kernel.org/fedora http://mirror.steadfast.net/fedora/core http://mirror.steadfast.net/fedora/extras http://mirror.steadfast.net/fedora http://mirrors.ptd.net/fedora ftp://mirrors.ptd.net/fedora/core http://mirror.linux.duke.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/extras http://mirror.linux.duke.edu/pub/fedora/linux http://mirror.clarkson.edu/pub/distributions/fedora ftp://mirror.colorado.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core http://mirror.engr.sjsu.edu/pub/fedora/linux/core http://mirror.phy.olemiss.edu/mirror/fedora/core ftp://mirror.phy.olemiss.edu/fedora/core http://mirror.phy.olemiss.edu/mirror/fedora/extras ftp://mirror.phy.olemiss.edu/fedora/extras http://mirrors.xmission.com/fedora/core http://mirror.usu.edu/mirrors/fedora/linux/core http://mirror.usu.edu/mirrors/fedora/linux/extras http://mirror.usu.edu/mirrors/fedora/linux ftp://redhat.taygeta.com/pub/RedHat/fedora/core http://srl.cs.jhu.edu/YUM/fedora/core http://srl.cs.jhu.edu/YUM/fedora/extras http://srl.cs.jhu.edu/YUM/fedora ftp://thales.memphis.edu/fedora/linux/core ftp://wuarchive.wustl.edu/pub/linux/distributions/fedora http://download.fedora.redhat.com/pub/fedora/linux/core http://download.fedora.redhat.com/pub/fedora/linux/extras http://download.fedora.redhat.com/pub/epel http://download.fedora.redhat.com/pub/fedora/linux http://fedora.mirrors.tds.net/pub/fedora-core http://fedora.mirrors.tds.net/pub/fedora-core-extras http://fedora.mirrors.tds.net/pub/fedora http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/extras http://mirrors.tummy.com/pub/fedora.redhat.com/epel http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux http://mirror.hiwaay.net/pub/fedora/linux/core http://mirror.hiwaay.net/pub/fedora/linux/extras http://mirror.hiwaay.net/pub/fedora/linux ftp://ftp.software.umn.edu/linux/fedora/core ftp://ftp.software.umn.edu/linux/fedora http://linux.nssl.noaa.gov/fedora/linux/core http://linux.nssl.noaa.gov/fedora/linux/extras http://linux.nssl.noaa.gov/fedora/linux ftp://ftp.uci.edu/mirrors/fedora/linux/core ftp://ftp.uci.edu/mirrors/fedora/linux/extras ftp://ftp.uci.edu/mirrors/fedora/linux http://mirror.nuvio.com/pub/fedora/linux/core http://mirror.nuvio.com/pub/fedora/linux/extras http://mirror.nuvio.com/pub/fedora/linux http://mirror.newnanutilities.org/pub/fedora/linux/core http://mirror.newnanutilities.org/pub/fedora/linux/extras http://mirror.newnanutilities.org/pub/fedora/linux http://mirror.web-ster.com/fedora/core http://mirror.web-ster.com/fedora/extras http://mirror.web-ster.com/fedora http://kdeforge.unl.edu/mirrors/fedora/linux/core http://kdeforge.unl.edu/mirrors/fedora/linux/extras http://kdeforge.unl.edu/mirrors/fedora/linux http://kdeforge.unl.edu/mirrors/fedora/epel http://mirror.cogentco.com/pub/linux/fedora/linux/core http://mirror.cogentco.com/pub/linux/fedora/linux/extras http://mirror.cogentco.com/pub/linux/fedora/linux http://www.gtlib.gatech.edu/pub/fedora-epel ftp://ftp.gtlib.gatech.edu/pub/fedora-epel http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/extras ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/extras http://www.gtlib.gatech.edu/pub/fedora.redhat/linux ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux http://fedora.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core http://fedora.is.co.za/linux/distributions/fedora/linux/extras ftp://ftp.is.co.za/linux/distributions/fedora/linux/extras http://fedora.is.co.za/linux/distributions/fedora/linux ftp://ftp.is.co.za/linux/distributions/fedora/linux		ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core ftp://mirror.eas.muohio.edu/pub/fedora/linux/core http://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://ftp.net.usf.edu/pub/fedora/linux/core http://redhat.secsup.org/fedora/core ftp://redhat.secsup.org/pub/linux/redhat/fedora/core http://rpmfind.net/linux/fedora/core ftp://rpmfind.net/linux/fedora/core ftp://ftp.dc.aleron.net/pub/linux/fedora/linux/core ftp://mirror.newnanutilities.org/pub/fedora/linux/core ftp://ftp.software.umn.edu/pub/linux/fedora/core ftp://ftp.webtrek.com/pub/mirrors/fedora ftp://ftp.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core ftp://mirror.clarkson.edu/pub/distributions/fedora http://mirror.clarkson.edu/pub/distributions/fedora ftp://fedora.mirrors.tds.net/pub/fedora-core http://linux.nssl.noaa.gov/fedora/core ftp://linux.nssl.noaa.gov/fedora/core http://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://limestone.uoregon.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora/linux/core http://mirrors.kernel.org/fedora/core ftp://mirrors.kernel.org/fedora/core ftp://mirror.web-ster.com/fedora ftp://less.cogeco.net/pub/fedora/linux/core ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core ftp://redhat.eyetap.org/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core ftp://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://ftp.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.tecnoera.com/pub/fedora/linux ftp://mirror.netglobalis.net/pub/fedora ftp://gd.tuwien.ac.at/opsys/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core http://sunsite.mff.cuni.cz/pub/fedora ftp://sunsite.mff.cuni.cz/pub/fedora ftp://ultra.linux.cz/pub/fedora ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/core ftp://ftp6.linux.cz/pub/linux/fedora/linux/core ftp://ftp1.skynet.cz/pub/linux/fedora ftp://klid.dk/pub/fedora/linux/core http://redhat.linux.ee/pub/fedora/linux/core ftp://redhat.linux.ee/pub/fedora/linux/core ftp://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.ipv6.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://fr.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/core ftp://fr2.rpmfind.net/linux/fedora/core http://wftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core ftp://ftp.stw-bonn.de/pub/mirror/fedora/linux/core ftp://ftp.join.uni-muenster.de/pub/linux/distributions/fedora/linux/core ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/fedora-core ftp://ftp.rhein-zeitung.de/mirrors/fedora.redhat.com ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/fedora.redhat.com/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/core ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core http://download.atrpms.net/mirrors/fedoracore http://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux/core http://ftp.rhnet.is/pub/fedora ftp://ftp.rhnet.is/pub/fedora http://ftp.heanet.ie/pub/fedora/linux/core ftp://ftp.heanet.ie/pub/fedora/linux/core http://ftp.esat.net/pub/linux/fedora ftp://ftp.esat.net/pub/linux/fedora ftp://ftp.edisontel.com/pub/Fedora_Mirror ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://alviss.et.tudelft.nl/pub/fedora/core http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora ftp://ftp.easynet.nl/mirror/fedora ftp://ftp.eu.uu.net/pub/linux/fedora ftp://ftp.uninett.no/pub/linux/Fedora/core ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core ftp://ftp.wsisiz.edu.pl/mirror/download.fedora.redhat.com ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core ftp://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com/core http://ftp.iasi.roedu.net/pub/mirrors/fedora.redhat.com/core http://ftp.idilis.ro/mirrors/fedora/core ftp://ftp.idilis.ro/mirrors/fedora/core http://ftp.lug.ro/fedora/linux/core ftp://ftp.lug.ro/fedora/linux/core ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora http://ftp.chg.ru/pub/Linux/fedora/linux/core ftp://ftp.chg.ru/pub/Linux/fedora/linux/core http://ftp.rhd.ru/pub/fedora/linux/core ftp://ftp.rhd.ru/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/core ftp://ftp.udl.es/pub/fedora/linux/core http://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.cica.es/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.netcraft.com.au/pub/fedora/linux/core http://planetmirror.com/pub/fedora/linux/core http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/redhat/fedora http://download.stmc.edu.hk/fedora/linux/core ftp://download.stmc.edu.hk/fedora/linux/core ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora http://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.riken.go.jp/pub/Linux/fedora/core ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://mymirror.asiaosc.org/redhat/fedora/core ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.oss.eznetsols.org/linux/fedora http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core
+fedora		ftp://ftp.uni-klu.ac.at/linux/fedora/linux/core http://fedora.inode.at ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/extras http://ftp.univie.ac.at/systems/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora/extras http://ftp.univie.ac.at/systems/linux/fedora http://ftp.netcraft.com.au/pub/fedora/linux/core http://ftp.netcraft.com.au/pub/fedora/linux http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/fedora/linux/core http://mirror.pacific.net.au/linux/fedora/linux/extras http://mirror.pacific.net.au/linux/fedora/linux http://mirror.pacific.net.au/linux/fedora/epel http://mirror.aarnet.edu.au/pub/fedora/linux/core http://mirror.aarnet.edu.au/pub/fedora/linux/extras http://mirror.aarnet.edu.au/pub/fedora/linux http://public.www.planetmirror.com/pub/fedora/linux/core http://public.planetmirror.com/pub/fedora/linux/extras http://public.www.planetmirror.com/pub/fedora/linux http://mirror.optus.net/fedora/linux/core http://mirror.optus.net/fedora/linux/extras http://mirror.optus.net/fedora/linux http://mirror.internode.on.net/pub/fedora/linux/core http://mirror.internode.on.net/pub/fedora/linux/extras http://mirror.internode.on.net/pub/fedora/linux http://ftp.belnet.be/linux/fedora/linux/core http://ftp.belnet.be/linux/fedora/linux/extras http://ftp.belnet.be/linux/fedora/linux http://mirrors.evrocom.net/fedora/linux/core ftp://mirrors.evrocom.net/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.muug.mb.ca/pub/fedora/linux/extras ftp://ftp.muug.mb.ca/pub/fedora/linux/extras http://www.muug.mb.ca/pub/fedora/linux ftp://ftp.muug.mb.ca/pub/fedora/linux http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/extras ftp://ftp.telus.net/pub/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/extras ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/extras http://gulus.usherbrooke.ca/pub/distro/fedora/linux http://fedora.arcticnetwork.ca/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://mirror.switch.ch/ftp/mirror/fedora/linux/extras ftp://mirror.switch.ch/mirror/fedora/linux/extras http://mirror.switch.ch/ftp/mirror/fedora/linux ftp://mirror.switch.ch/mirror/fedora/linux ftp://ftp.solnet.ch/mirror/fedora/linux/core ftp://ftp.solnet.ch/mirror/fedora/linux ftp://ftp.telmexchile.cl/Unix/fedora/linux/core ftp://ftp.telmexchile.cl/Unix/fedora/linux/extras http://fedora.candishosting.com.cn/pub/fedora/linux http://mirrors.cytanet.com.cy/linux/fedora/linux http://ftp.sh.cvut.cz/MIRRORS/fedora http://ftp.sh.cvut.cz/MIRRORS/fedora-extras http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/extras http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux http://ftp.linux.cz/pub/linux/fedora-core http://ftp.linux.cz/pub/linux/fedora/linux/extras http://ftp.fi.muni.cz/pub/linux/fedora/linux http://ftp1.skynet.cz/pub/linux/fedora/core http://ftp1.skynet.cz/pub/linux/fedora/extras http://ftp1.skynet.cz/pub/linux/fedora http://mirror.karneval.cz/pub/linux/fedora/linux/core http://mirror.karneval.cz/pub/linux/fedora/linux/extras http://mirror.karneval.cz/pub/linux/fedora/linux http://mirror.karneval.cz/pub/linux/fedora/epel http://sunsite.informatik.rwth-aachen.de/cgi-bin/ftp.new/ftpshow/pub/Linux/fedora/linux http://ftp-stud.hs-esslingen.de/pub/fedora/linux/extras http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core http://ftp-stud.hs-esslingen.de/pub/fedora/linux http://ftp.stw-bonn.de/pub/fedora/linux/core http://ftp.stw-bonn.de/pub/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-core http://fedora.tu-chemnitz.de/pub/linux/fedora-core-extras http://fedora.tu-chemnitz.de/pub/linux/fedora/linux http://fedora.tu-chemnitz.de/pub/linux/fedora-epel http://mirror.atrpms.net/fedora/linux/core http://mirror.atrpms.net/fedora/linux/extras http://mirror.atrpms.net/fedora/linux http://ftp.informatik.uni-frankfurt.de/fedora/core ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/core http://ftp.informatik.uni-frankfurt.de/fedora/extras ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/fedora.redhat.com/extras http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/core http://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux/core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core http://ftp.uni-bayreuth.de/linux/fedora/linux/extras ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/extras http://ftp.uni-bayreuth.de/linux/fedora/linux ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux ftp://ftp.fu-berlin.de/linux/fedora/core ftp://ftp.fu-berlin.de/linux/fedora/extras http://ftp.uni-koeln.de/mirrors/fedora/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/extras http://www.jur-linux.org/download/fedora/core http://www.jur-linux.org/download/fedora http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/core http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux/extras http://mirror.fraunhofer.de/download.fedora.redhat.com/fedora/linux http://mirror.fraunhofer.de/download.fedora.redhat.com/epel ftp://klid.dk/fedora/linux/core http://ftp.crc.dk/fedora/linux/core ftp://ftp.crc.dk/pub/mirrors/fedora/linux/core http://ftp.crc.dk/fedora/linux/extras ftp://ftp.crc.dk/pub/mirrors/fedora/linux/extras http://ftp.crc.dk/fedora/linux ftp://ftp.crc.dk/pub/mirrors/fedora/linux http://ftp.crc.dk/fedora-epel ftp://ftp.crc.dk/pub/mirrors/fedora-epel http://redhat.linux.ee/pub/fedora/linux/core http://ftp.linux.ee/pub/fedora/linux http://ftp.udl.es/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/extras http://ftp.udl.es/pub/fedora/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/core http://ftp.gui.uva.es/sites/fedora.redhat.com/linux/extras http://ftp.gui.uva.es/sites/fedora.redhat.com/linux http://ftp.gui.uva.es/sites/fedora.redhat.com/epel http://distribuciones.telecable.es/fedora http://ftp.caliu.info/pub/distribucions/fedora http://ftp.cica.es/fedora/linux/core http://ftp.cica.es/fedora/linux/extras http://ftp.cica.es/fedora/linux http://sunsite.rediris.es/mirror/fedora-redhat/core ftp://ftp.rediris.es/mirror/fedora-redhat/core http://sunsite.rediris.es/mirror/fedora-extras ftp://ftp.rediris.es/mirror/fedora-extras http://sunsite.rediris.es/mirror/fedora-redhat ftp://ftp.rediris.es/mirror/fedora-redhat http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/core http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/extras http://ftp.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/linux/core http://mirrors.ircam.fr/pub/fedora/linux/extras http://mirrors.ircam.fr/pub/fedora/linux http://mirrors.ircam.fr/pub/fedora/epel http://fr.rpmfind.net/linux/fedora/core http://fr.rpmfind.net/linux/fedora/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux ftp://ftp.redhat.ikoula.com/fedora http://fr2.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/extras http://fr2.rpmfind.net/linux/fedora ftp://ftp.ciril.fr/pub/linux/fedora/linux/core ftp://ftp.ciril.fr/pub/linux/fedora/linux ftp://ftp.cru.fr/pub/linux/fedora/core ftp://ftp.cru.fr/pub/linux/fedora/extras ftp://ftp.cru.fr/pub/linux/fedora http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.univ-pau.fr/pub/mirrors/fedora ftp://ftp.uvsq.fr/pub/fedora ftp://ftp.lip6.fr/pub/linux/distributions/fedora http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux/extras ftp://ftp.proxad.net/mirrors/fedora.redhat.com/fedora/linux http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/extras http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/epel http://ftp.ntua.gr/pub/linux/fedora/linux/core http://ftp.ntua.gr/pub/linux/fedora/linux/extras http://ftp.ntua.gr/pub/linux/fedora/linux ftp://ftp.otenet.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux ftp://ftp.ceid.upatras.gr/pub/fedora/linux http://ftp.hostrino.com/pub/fedora/linux/core http://ftp.hostrino.com/pub/fedora/linux http://download.stmc.edu.hk/fedora/linux/core ftp://ftp2.surplux.net/pub/fedora ftp://ftp.tvnet.hu/pub/fedora/linux/core ftp://ftp.tvnet.hu/pub/fedora/linux http://ftp.esat.net/pub/linux/fedora http://ftp.esat.net/mirrors/download.fedora.redhat.com/pub/fedora/linux/core http://ftp.esat.net/mirrors/download.fedora.redhat.com/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/core http://ftp.heanet.ie/pub/fedora/linux/extras http://ftp.heanet.ie/pub/fedora/linux http://ftp.heanet.ie/pub/fedora/linux/epel http://ftp.rhnet.is/pub/fedora/linux/core http://ftp.rhnet.is/pub/fedora/linux/extras http://ftp.rhnet.is/pub/fedora/linux http://ftp.unina.it/pub/linux/distributions/fedora http://fedora.fastbull.org http://fedora.mirror.garr.it/mirrors/fedora/linux/core http://fedora.mirror.garr.it/mirrors/fedora/linux/extras http://fedora.mirror.garr.it/mirrors/fedora/linux http://ftp.riken.jp/Linux/fedora/core http://ftp.riken.jp/Linux/fedora/extras http://ftp.riken.jp/Linux/fedora/epel http://ftp.riken.jp/Linux/fedora http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core http://ftp.nara.wide.ad.jp/pub/Linux/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora/core http://ftp.kddilabs.jp/Linux/packages/fedora/extras http://ftp.kddilabs.jp/Linux/packages/fedora http://ftp.kddilabs.jp/Linux/packages/fedora/epel http://ftp.iij.ad.jp/pub/linux/fedora/core http://ftp.iij.ad.jp/pub/linux/fedora/extras http://ftp.iij.ad.jp/pub/linux/fedora http://ftp.iij.ad.jp/pub/linux/fedora/epel http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/extras http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/epel ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://ftp.kaist.ac.kr/pub/fedora/linux/core ftp://ftp.kaist.ac.kr/fedora/linux/core http://ftp.kaist.ac.kr/pub/fedora/linux/extras ftp://ftp.kaist.ac.kr/fedora/linux/extras http://ftp.kaist.ac.kr/pub/fedora/linux ftp://ftp.kaist.ac.kr/fedora/linux http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/core http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux/extras ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux/extras http://mirrors.linux.edu.lv/ftp.redhat.com/pub/fedora/linux ftp://ftp.linux.edu.lv/mirrors/ftp.redhat.com/pub/fedora/linux http://fedora.ifc.unam.mx/core ftp://mirror.ifc.unam.mx/fedora/core http://fedora.ifc.unam.mx ftp://mirror.ifc.unam.mx/fedora ftp://fedora.namibia.na/pub/fedora ftp://fedora.namibia.na/fedora/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/core http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux/extras http://ftp.SURFnet.nl/pub/os/Linux/distr/fedora/linux ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/extras http://mirror.hosting-concepts.com/pub/os/linux/fedora ftp://ftp.tudelft.nl/pub/Linux/download.fedora.redhat.com/linux ftp://alviss.et.tudelft.nl/pub/fedora/linux/core ftp://alviss.et.tudelft.nl/pub/fedora/linux/extras ftp://alviss.et.tudelft.nl/pub/fedora/linux ftp://ftp.uib.no/pub/fedora/linux/core ftp://ftp.uib.no/pub/fedora/linux/extras ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.pbone.net/pub/fedora/linux/core ftp://ftp.pbone.net/pub/fedora/linux/extras ftp://ftp.pbone.net/pub/fedora/linux ftp://ftp.tpnet.pl/d17/fedora http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/extras http://sunsite.icm.edu.pl/pub/Linux/fedora/linux http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/extras http://ftp.pwr.wroc.pl/pub/linux/fedora/linux http://ftp.ps.pl:/pub/linux/fedora-core http://ftp.ps.pl:/pub/linux/fedora-extras http://ftp.ps.pl/pub/Linux/fedora-epel http://ftp.ps.pl/pub/Linux/fedora-linux ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/extras ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core http://ftp.astral.ro/mirrors/fedora/pub/epel http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/extras http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com http://ftp.idilis.ro/mirrors/fedora/core http://ftp.gts.lug.ro/fedora/linux/core http://ftp.gts.lug.ro/fedora/linux/extras http://ftp.gts.lug.ro/fedora/linux http://mirror.etf.bg.ac.yu/fedora ftp://ftp.anders.ru/pub/Linux/fedora/linux/core http://mirror.yandex.ru/fedora/linux/core http://mirror.yandex.ru/fedora/linux/extras http://mirror.yandex.ru/fedora/linux http://ftp.chg.ru/pub/Linux/fedora/linux/core http://ftp.chg.ru/pub/Linux/fedora/linux/extras http://ftp.chg.ru/pub/Linux/fedora/linux http://ftp.rhd.ru/pub/fedora/linux/core http://ftp.rhd.ru/pub/fedora/linux/extras ftp://ftp.rhd.ru/pub/fedora/linux http://ftp.sunet.se/pub/Linux/distributions/fedora http://ftp.port80.se/fedora/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/extras ftp://falkor.skane.se/pub/mirrors/fedora/core ftp://falkor.skane.se/pub/mirrors/fedora/linux ftp://ftp.oss.eznetsols.org/linux/fedora ftp://ftp.bevc.net/mirrors/fedora http://mirrors.bevc.net/fedora http://ftp.upjs.sk/pub/fedora/linux/core http://ftp.upjs.sk/pub/fedora/linux/extras http://ftp.upjs.sk/pub/fedora/linux ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/core ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux/extras ftp://ftp.cs.hacettepe.edu.tr/pub/mirrors/fedora/linux ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux http://ftp.mirror.tw/pub/fedora/linux/core ftp://fedora.org.ua/pub/linux/fedora http://ftp.tlk-l.net/pub/mirrors/fedora/core http://ftp.tlk-l.net/pub/mirrors/fedora/extras http://ftp.tlk-l.net/pub/mirrors/fedora http://ftp.usf.edu/pub/fedora/linux/core http://ftp.usf.edu/pub/fedora/linux http://fedora.mirror.iweb.ca/core http://fedora.mirror.iweb.ca/extras http://fedora.mirror.iweb.ca http://limestone.uoregon.edu/ftp/fedora ftp://limestone.uoregon.edu/fedora http://limestone.uoregon.edu/ftp/fedora/extras ftp://limestone.uoregon.edu/fedora/extras http://limestone.uoregon.edu/ftp/fedora/linux ftp://limestone.uoregon.edu/fedora/linux http://fedora.secsup.org/linux/core ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux/core http://fedora.secsup.org/linux ftp://fedora.secsup.org/pub/linux/redhat/fedora/linux http://distro.ibiblio.org/pub/linux/distributions/fedora/linux http://mirrors.tiatera.com/fedora/core http://mirrors.tiatera.com/fedora/extras http://mirrors.tiatera.com/fedora/linux http://ftp.linux.ncsu.edu/pub/fedora/linux/core http://ftp.linux.ncsu.edu/pub/fedora/linux/extras http://ftp.linux.ncsu.edu/pub/fedora/linux ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/extras ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/core http://mirrors.usc.edu/pub/linux/distributions/fedora/linux/extras http://mirrors.usc.edu/pub/linux/distributions/fedora/linux ftp://mirror.nyi.net/fedora/linux/core ftp://mirror.nyi.net/fedora/linux ftp://fedora.bu.edu/core ftp://fedora.bu.edu/extras ftp://fedora.bu.edu http://mirror.anl.gov/pub/fedora/linux/core http://mirror.anl.gov/pub/fedora/linux ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/extras ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux http://mirror.stanford.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora http://mirror.stanford.edu/fedora/linux ftp://mirror.stanford.edu/pub/mirrors/fedora/linux http://coblitz.planet-lab.org/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/core http://mirror.cc.vt.edu/pub/fedora/linux/extras http://mirror.cc.vt.edu/pub/fedora/linux http://mirrors.cat.pdx.edu/fedora/linux/core http://mirrors.cat.pdx.edu/fedora/linux/extras http://mirrors.cat.pdx.edu/fedora/linux http://mirrors.cat.pdx.edu/fedora/epel http://fedora.omnispring.com/core http://fedora.omnispring.com/extras http://ftp.ale.org/pub/fedora/linux/core ftp://ftp.ale.org/mirrors/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux/core ftp://ftp.applios.net/pub/fedora/linux ftp://ftp.webtrek.com/pub/mirrors/fedora http://ftp.ndlug.nd.edu/pub/fedora/linux/core http://mirrors.kernel.org/fedora/core http://mirrors.kernel.org/fedora/extras http://mirrors.kernel.org/fedora http://mirror.steadfast.net/fedora/core http://mirror.steadfast.net/fedora/extras http://mirror.steadfast.net/fedora http://mirrors.ptd.net/fedora ftp://mirrors.ptd.net/fedora/core http://mirror.linux.duke.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/extras http://mirror.linux.duke.edu/pub/fedora/linux http://mirror.clarkson.edu/pub/distributions/fedora ftp://mirror.colorado.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core http://mirror.engr.sjsu.edu/pub/fedora/linux/core http://mirror.phy.olemiss.edu/mirror/fedora/core ftp://mirror.phy.olemiss.edu/fedora/core http://mirror.phy.olemiss.edu/mirror/fedora/extras ftp://mirror.phy.olemiss.edu/fedora/extras http://mirrors.xmission.com/fedora/core http://mirror.usu.edu/mirrors/fedora/linux/core http://mirror.usu.edu/mirrors/fedora/linux/extras http://mirror.usu.edu/mirrors/fedora/linux ftp://redhat.taygeta.com/pub/RedHat/fedora/core http://srl.cs.jhu.edu/YUM/fedora/core http://srl.cs.jhu.edu/YUM/fedora/extras http://srl.cs.jhu.edu/YUM/fedora ftp://thales.memphis.edu/fedora/linux/core ftp://wuarchive.wustl.edu/pub/linux/distributions/fedora http://download.fedora.redhat.com/pub/fedora/linux/core http://download.fedora.redhat.com/pub/fedora/linux/extras http://download.fedora.redhat.com/pub/epel http://download.fedora.redhat.com/pub/fedora/linux http://fedora.mirrors.tds.net/pub/fedora-core http://fedora.mirrors.tds.net/pub/fedora-core-extras http://fedora.mirrors.tds.net/pub/fedora http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/extras http://mirrors.tummy.com/pub/fedora.redhat.com/epel http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux http://mirror.hiwaay.net/pub/fedora/linux/core http://mirror.hiwaay.net/pub/fedora/linux/extras http://mirror.hiwaay.net/pub/fedora/linux ftp://ftp.software.umn.edu/linux/fedora/core ftp://ftp.software.umn.edu/linux/fedora http://linux.nssl.noaa.gov/fedora/linux/core http://linux.nssl.noaa.gov/fedora/linux/extras http://linux.nssl.noaa.gov/fedora/linux ftp://ftp.uci.edu/mirrors/fedora/linux/core ftp://ftp.uci.edu/mirrors/fedora/linux/extras ftp://ftp.uci.edu/mirrors/fedora/linux http://mirror.nuvio.com/pub/fedora/linux/core http://mirror.nuvio.com/pub/fedora/linux/extras http://mirror.nuvio.com/pub/fedora/linux http://mirror.newnanutilities.org/pub/fedora/linux/core http://mirror.newnanutilities.org/pub/fedora/linux/extras http://mirror.newnanutilities.org/pub/fedora/linux http://mirror.web-ster.com/fedora/core http://mirror.web-ster.com/fedora/extras http://mirror.web-ster.com/fedora http://kdeforge.unl.edu/mirrors/fedora/linux/core http://kdeforge.unl.edu/mirrors/fedora/linux/extras http://kdeforge.unl.edu/mirrors/fedora/linux http://kdeforge.unl.edu/mirrors/fedora/epel http://mirror.cogentco.com/pub/linux/fedora/linux/core http://mirror.cogentco.com/pub/linux/fedora/linux/extras http://mirror.cogentco.com/pub/linux/fedora/linux http://www.gtlib.gatech.edu/pub/fedora-epel ftp://ftp.gtlib.gatech.edu/pub/fedora-epel http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/extras ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/extras http://www.gtlib.gatech.edu/pub/fedora.redhat/linux ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux http://fedora.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core http://fedora.is.co.za/linux/distributions/fedora/linux/extras ftp://ftp.is.co.za/linux/distributions/fedora/linux/extras http://fedora.is.co.za/linux/distributions/fedora/linux ftp://ftp.is.co.za/linux/distributions/fedora/linux		ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core http://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.linux.duke.edu/pub/fedora/linux/core ftp://mirror.cs.princeton.edu/pub/mirrors/fedora/linux/core ftp://ftp.cse.buffalo.edu/pub/fedora/linux/core http://mirror.eas.muohio.edu/fedora/linux/core ftp://mirror.eas.muohio.edu/pub/fedora/linux/core http://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirror.hiwaay.net/redhat/fedora/linux/core ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com ftp://ftp.net.usf.edu/pub/fedora/linux/core http://redhat.secsup.org/fedora/core ftp://redhat.secsup.org/pub/linux/redhat/fedora/core http://rpmfind.net/linux/fedora/core ftp://rpmfind.net/linux/fedora/core ftp://ftp.dc.aleron.net/pub/linux/fedora/linux/core ftp://mirror.newnanutilities.org/pub/fedora/linux/core ftp://ftp.software.umn.edu/pub/linux/fedora/core ftp://ftp.webtrek.com/pub/mirrors/fedora ftp://ftp.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core http://www.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core ftp://mirror.clarkson.edu/pub/distributions/fedora http://mirror.clarkson.edu/pub/distributions/fedora ftp://fedora.mirrors.tds.net/pub/fedora-core http://linux.nssl.noaa.gov/fedora/core ftp://linux.nssl.noaa.gov/fedora/core http://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://mirror.cs.wisc.edu/pub/mirrors/linux/download.fedora.redhat.com/pub/fedora/linux/core ftp://limestone.uoregon.edu/fedora ftp://mirror.stanford.edu/pub/mirrors/fedora/linux/core http://mirrors.kernel.org/fedora/core ftp://mirrors.kernel.org/fedora/core ftp://mirror.web-ster.com/fedora ftp://less.cogeco.net/pub/fedora/linux/core ftp://ftp.nrc.ca/pub/systems/linux/redhat/fedora/linux/core ftp://redhat.eyetap.org/fedora/linux/core ftp://ftp.telus.net/pub/fedora/linux/core http://gulus.usherbrooke.ca/pub/distro/fedora/linux/core http://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core ftp://mirror.cpsc.ucalgary.ca/mirror/fedora/linux/core http://ftp.muug.mb.ca/pub/fedora/linux/core ftp://ftp.muug.mb.ca/pub/fedora/linux/core http://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://www.las.ic.unicamp.br/pub/fedora/linux/core ftp://mirror.pop-rs.rnp.br/pub/download.fedora.redhat.com/pub/fedora/linux/core ftp://ftp.tecnoera.com/pub/fedora/linux ftp://mirror.netglobalis.net/pub/fedora ftp://gd.tuwien.ac.at/opsys/linux/fedora/core http://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.univie.ac.at/systems/linux/fedora ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core http://sunsite.mff.cuni.cz/pub/fedora ftp://sunsite.mff.cuni.cz/pub/fedora ftp://ultra.linux.cz/pub/fedora ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/core ftp://ftp6.linux.cz/pub/linux/fedora/linux/core ftp://ftp1.skynet.cz/pub/linux/fedora ftp://klid.dk/pub/fedora/linux/core http://redhat.linux.ee/pub/fedora/linux/core ftp://redhat.linux.ee/pub/fedora/linux/core ftp://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core ftp://ftp.ipv6.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core ftp://fr.rpmfind.net/linux/fedora/core http://fr2.rpmfind.net/linux/fedora/core ftp://fr2.rpmfind.net/linux/fedora/core http://wftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.tu-chemnitz.de/pub/linux/fedora-core ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core ftp://ftp.stw-bonn.de/pub/mirror/fedora/linux/core ftp://ftp.join.uni-muenster.de/pub/linux/distributions/fedora/linux/core ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/fedora-core ftp://ftp.rhein-zeitung.de/mirrors/fedora.redhat.com ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/fedora.redhat.com/linux/core http://ftp.uni-koeln.de/mirrors/fedora/linux/core ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core http://download.atrpms.net/mirrors/fedoracore http://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.ntua.gr/pub/linux/fedora/linux/core ftp://ftp.otenet.gr/pub/linux/fedora/linux/core http://ftp.rhnet.is/pub/fedora ftp://ftp.rhnet.is/pub/fedora http://ftp.heanet.ie/pub/fedora/linux/core ftp://ftp.heanet.ie/pub/fedora/linux/core http://ftp.esat.net/pub/linux/fedora ftp://ftp.esat.net/pub/linux/fedora ftp://ftp.edisontel.com/pub/Fedora_Mirror ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com ftp://alviss.et.tudelft.nl/pub/fedora/core http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora ftp://ftp.eu.uu.net/pub/linux/fedora ftp://ftp.uninett.no/pub/linux/Fedora/core ftp://tux.cprm.net/pub/ftp.redhat.com/fedora/linux/core ftp://ftp.wsisiz.edu.pl/mirror/download.fedora.redhat.com ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core http://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core ftp://sunsite.icm.edu.pl/pub/Linux/fedora/linux/core http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com/core http://ftp.iasi.roedu.net/pub/mirrors/fedora.redhat.com/core http://ftp.idilis.ro/mirrors/fedora/core ftp://ftp.idilis.ro/mirrors/fedora/core http://ftp.lug.ro/fedora/linux/core ftp://ftp.lug.ro/fedora/linux/core ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora http://ftp.chg.ru/pub/Linux/fedora/linux/core ftp://ftp.chg.ru/pub/Linux/fedora/linux/core http://ftp.rhd.ru/pub/fedora/linux/core ftp://ftp.rhd.ru/pub/fedora/linux/core http://ftp.udl.es/pub/fedora/linux/core ftp://ftp.udl.es/pub/fedora/linux/core http://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.rediris.es/mirror/fedora.redhat ftp://ftp.cica.es/fedora/linux/core ftp://ftp.chl.chalmers.se/pub/fedora/linux/core ftp://mirror.switch.ch/mirror/fedora/linux/core http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core ftp://ftp.linux.org.tr/pub/fedora/linux/core ftp://ftp.is.co.za/linux/distributions/fedora/linux/core ftp://ftp.netcraft.com.au/pub/fedora/linux/core http://planetmirror.com/pub/fedora/linux/core http://mirror.pacific.net.au/linux/redhat/fedora ftp://mirror.pacific.net.au/linux/redhat/fedora http://download.stmc.edu.hk/fedora/linux/core ftp://download.stmc.edu.hk/fedora/linux/core ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora http://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.kddilabs.jp/Linux/packages/fedora/core ftp://ftp.riken.go.jp/pub/Linux/fedora/core ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core ftp://mirror.hostway.co.kr/pub/fedora http://mymirror.asiaosc.org/redhat/fedora/core ftp://ftp.wicks.co.nz/pub/linux/dist/fedora ftp://ftp.oss.eznetsols.org/linux/fedora http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core
 filefront	http://ftp.games.skynet.be/pub/www.filesnetwork.com ftp://ftp.games.skynet.be/pub/www.filesnetwork.com
 flightgear	ftp://ftp.de.flightgear.org/pub/fgfs http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://ftp.kingmont.com/flightsims/flightgear ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org
 freebsd		ftp://ftp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ar.FreeBSD.org/pub/FreeBSD/ ftp://ftp.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ca.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ca.FreeBSD.org/ ftp://ftp.cn.FreeBSD.org/pub/FreeBSD/ ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/ ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ee.FreeBSD.org/pub/FreeBSD/ ftp://ftp.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.hk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.is.FreeBSD.org/pub/FreeBSD/ ftp://ftp.id.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp.it.FreeBSD.org/pub/FreeBSD/ ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.kr.FreeBSD.org/pub/FreeBSD/ ftp://ftp1.us.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.us.FreeBSD.org/pub/FreeBSD/
@@ -17,7 +17,7 @@ gimp		ftp://ftp.gimp.org/pub/gimp http://ftp.gwdg.de/pub/misc/grafik/gimp/gimp f
 github		https://github.com/downloads
 gmt		ftp://mirror.geosci.usyd.edu.au/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ibis.grdl.noaa.gov/pub/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/
 gnome		http://ftp.gnome.org/pub/gnome
-gnu		ftp://ftp.gnu.org/pub/gnu/ ftp://aeneas.mit.edu/pub/gnu/ ftp://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.chg.ru/pub/gnu/ ftp://ftp.club.cc.cmu.edu/gnu/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ ftp://ftp.cw.net/pub/gnu/ ftp://ftp.cw.net/pub/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ ftp://ftp.duth.gr/pub/gnu/ ftp://ftp.easynet.be/gnu/ ftp://ftp.esat.net/pub/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ ftp://ftp.gnu.org.ua/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ ftp://ftp.ironie.org/ftp.gnu.org/pub/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu ftp://ftp.isy.liu.se/pub/gnu/ ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ ftp://ftp.ntu.edu.tw/pub/gnu/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.ring.gr.jp/pub/GNU/ ftp://ftp.sh.cvut.cz/MIRRORS/gnu/pub/gnu/ ftp://ftp.sunet.se/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.ulak.net.tr/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ ftp://ftp.uninett.no/pub/gnu/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ ftp://gnu.mirror.iweb.com/gnu/ ftp://mirror-fpt-telecom.fpt.net/gnu/ ftp://mirror.anl.gov/pub/gnu/ ftp://mirror.cict.fr/gnu/ ftp://mirror.its.uidaho.edu/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ ftp://mirrors.igsobe.com/gnuftp/ ftp://mirrors.kernel.org/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ ftp://mirrors.ucr.ac.cr/GNU/gnu ftp://mirrors.usc.edu/pub/gnu/ ftp://sunsite.cnlab-switch.ch/mirror/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org/gnu/ http://artfiles.org/gnu.org/ftp/ http://core.ring.gr.jp/pub/GNU/ http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://ftp.club.cc.cmu.edu/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.download-by.net/gnu/gnu http://ftp.easynet.be/ftp/gnu/ http://ftp.gnu.mirrors.hoobly.com/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://ftp.sh.cvut.cz/MIRRORS/gnu/pub/gnu/ http://ftp.thaios.net/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.wayne.edu/pub/gnu/ http://gnu.07vn.com/gnu/ http://gnu.billfett.com/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://gnu.mirror.ironie.org/pub/gnu/ http://gnu.mirror.iweb.com/gnu/ http://gnu.parentinginformed.com/ http://gnu.promotionalpro.com/ http://gnu.raffsoftware.com/ http://gnu.sixsigmaonline.org/gnu/ http://gnu.skazkaforyou.com/ http://gnu.tropicalnorthqueensland.com.au/gnu/ http://mirror-fpt-telecom.fpt.net/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.clarkson.edu/gnu/ http://mirror.ibcp.fr/pub/gnu/ http://mirror.its.uidaho.edu/pub/gnu/ http://mirror.lihnidos.org/GNU/ftp/gnu/ http://mirror.vocabbuilder.net/gnu/ http://mirrors.aixtools.net/gnu/ http://mirrors.dotsrc.org/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.igsobe.com/gnuftp/ http://mirrors.kernel.org/gnu/ http://mirrors.nfsi.pt/gnu/ http://mirrors.privatejetscharter.net/gnu/gnu/ http://mirrors.ucr.ac.cr/GNU/gnu http://mirrors.usc.edu/pub/gnu/ http://mirrors.zerg.biz/gnu/ http://www.alliedquotes.com/mirrors/gnu/gnu/ http://www.de-mirrors.de/gnuftp/ http://www.fyxm.net/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://www.softliste.de/gnu/ http://www.very-clever.com/download/gnu/
+gnu		ftp://ftp.gnu.org/pub/gnu/ ftp://aeneas.mit.edu/pub/gnu/ ftp://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.chg.ru/pub/gnu/ ftp://ftp.club.cc.cmu.edu/gnu/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ ftp://ftp.cw.net/pub/gnu/ ftp://ftp.cw.net/pub/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ ftp://ftp.duth.gr/pub/gnu/ ftp://ftp.esat.net/pub/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ ftp://ftp.gnu.org.ua/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ ftp://ftp.ironie.org/ftp.gnu.org/pub/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu ftp://ftp.isy.liu.se/pub/gnu/ ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ ftp://ftp.ntu.edu.tw/pub/gnu/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.ring.gr.jp/pub/GNU/ ftp://ftp.sh.cvut.cz/MIRRORS/gnu/pub/gnu/ ftp://ftp.sunet.se/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.ulak.net.tr/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ ftp://ftp.uninett.no/pub/gnu/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ ftp://gnu.mirror.iweb.com/gnu/ ftp://mirror-fpt-telecom.fpt.net/gnu/ ftp://mirror.anl.gov/pub/gnu/ ftp://mirror.cict.fr/gnu/ ftp://mirror.its.uidaho.edu/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ ftp://mirrors.igsobe.com/gnuftp/ ftp://mirrors.kernel.org/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ ftp://mirrors.ucr.ac.cr/GNU/gnu ftp://mirrors.usc.edu/pub/gnu/ ftp://sunsite.cnlab-switch.ch/mirror/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org/gnu/ http://artfiles.org/gnu.org/ftp/ http://core.ring.gr.jp/pub/GNU/ http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://ftp.club.cc.cmu.edu/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.download-by.net/gnu/gnu http://ftp.gnu.mirrors.hoobly.com/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://ftp.sh.cvut.cz/MIRRORS/gnu/pub/gnu/ http://ftp.thaios.net/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.wayne.edu/pub/gnu/ http://gnu.07vn.com/gnu/ http://gnu.billfett.com/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://gnu.mirror.ironie.org/pub/gnu/ http://gnu.mirror.iweb.com/gnu/ http://gnu.parentinginformed.com/ http://gnu.promotionalpro.com/ http://gnu.raffsoftware.com/ http://gnu.sixsigmaonline.org/gnu/ http://gnu.skazkaforyou.com/ http://gnu.tropicalnorthqueensland.com.au/gnu/ http://mirror-fpt-telecom.fpt.net/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.clarkson.edu/gnu/ http://mirror.ibcp.fr/pub/gnu/ http://mirror.its.uidaho.edu/pub/gnu/ http://mirror.lihnidos.org/GNU/ftp/gnu/ http://mirror.vocabbuilder.net/gnu/ http://mirrors.aixtools.net/gnu/ http://mirrors.dotsrc.org/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.igsobe.com/gnuftp/ http://mirrors.kernel.org/gnu/ http://mirrors.nfsi.pt/gnu/ http://mirrors.privatejetscharter.net/gnu/gnu/ http://mirrors.ucr.ac.cr/GNU/gnu http://mirrors.usc.edu/pub/gnu/ http://mirrors.zerg.biz/gnu/ http://www.alliedquotes.com/mirrors/gnu/gnu/ http://www.de-mirrors.de/gnuftp/ http://www.fyxm.net/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://www.softliste.de/gnu/ http://www.very-clever.com/download/gnu/
 gnu-alpha	ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ http://gnualpha.spinellicreations.com/gnu/ http://gnu.c3sl.ufpr.br/alpha/gnu/
 gnupg		http://gnupg.unixmexico.org/ftp/ http://ftp.linux.it/pub/mirrors/gnupg/ ftp://ftp.surfnet.nl/pub/security/gnupg/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ ftp://ftp.hi.is/pub/mirrors/gnupg/ ftp://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/ http://public.planetmirror.com/pub/
 hackage		http://hackage.haskell.org/ http://dev.gentoo.org/~qnikst/hdiff.luite.com/
@@ -29,7 +29,7 @@ kernel		http://www.kernel.org/pub
 liflg		http://liflg.death-row.org/files/final http://home.coc-ag.de/dressler-ro/liflg/files/final
 lokigames	http://mirrors.dotsrc.org/lokigames/updates http://lokifiles.tuxgames.com/updates
 mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www3.mplayerhq.hu/MPlayer http://www4.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer
-mysql		ftp://ftp.fu-berlin.de/unix/databases/mysql/ ftp://ftp.solnet.ch/mirror/mysql/ http://ftp.arnes.si/mysql/ http://ftp.astral.ro/mirrors/mysql.com/ http://ftp.gwdg.de/pub/misc/mysql/ http://ftp.heanet.ie/mirrors/www.mysql.com/ http://ftp.iij.ad.jp/pub/db/mysql/ http://ftp.itu.edu.tr/Mirror/Mysql/ http://ftp.jaist.ac.jp/pub/mysql/ http://ftp.ntua.gr/pub/databases/mysql/ http://ftp.sunet.se/pub/unix/databases/relational/mysql/ http://ftp.tpnet.pl/vol/d3/ftp.mysql.com/ http://mir2.ovh.net/ftp.mysql.com/ http://mirror.csclub.uwaterloo.ca/mysql/ http://mirror-fpt-telecom.fpt.net/mysql/ http://mirror.hostfuss.com/mysql/ http://mirror.khlug.org/mysql/ http://mirror.leaseweb.com/mysql/ http://mirror.mirimar.net/mysql/ http://mirrors.bevc.net/mysql/ http://mirrors.dedipower.com/www.mysql.com/ http://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/ http://mirrors.paknet.org/mysql/ http://mirrors.ucr.ac.cr/MySQL/ http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/ http://mirror.switch.ch/ftp/mirror/mysql/ http://mirrors.xservers.ro/mysql/ http://mysql.blic.net/ http://mysql.borsen.dk/ http://mysql.bst.lt/ http://mysql.byungsoo.net/ http://mysql.cdpa.nsysu.edu.tw/ http://mysql.cs.pu.edu.tw/ http://mysql.easynet.be/ http://mysql.eukhost.com/ http://mysql.he.net/ http://mysql.infocom.ua/ http://mysql.inspire.net.nz/ http://mysql.isu.edu.tw/ http://mysql.linux.cz/ http://mysql.llarian.net/ http://mysql.mirror.ac.za/ http://mysql.mirror.easycolocate.nl/ http://mysql.mirror.kangaroot.net/ http://mysqlmirror.netandhost.in/ http://mysql.mirror.rafal.ca/ http://mysql.mirrors.adc.am/ http://mysql.mirrors.arminco.com/ http://mysql.mirrors.crysys.hit.bme.hu/ http://mysql.mirrors.enexis.hu/ http://mysql.mirrors.ilisys.com.au/ http://mysql.mirrors.webazilla.nl/ http://mysql.mirror.tw/ http://mysql.nfsi.pt/ http://mysql.online.bg/ http://mysql.oss.eznetsols.org/ http://mysql.phphosts.org/ http://mysql.proserve.nl/ http://mysql.rediris.es/ http://mysql.rhnet.is/ http://mysql.sh.cvut.cz http://mysql.skynet.be/ http://mysql.spd.co.il/ http://mysql.speedbone.de/ http://mysql.stu.edu.tw/ http://mysql.thaiweb.net/ http://na.mirror.garr.it/mirrors/MySQL/ http://opensource.become.com/mysql/ http://sunsite.icm.edu.pl/mysql/ http://sunsite.informatik.rwth-aachen.de/mysql/ http://www.mirrorservice.org/sites/ftp.mysql.com/
+mysql		ftp://ftp.fu-berlin.de/unix/databases/mysql/ ftp://ftp.solnet.ch/mirror/mysql/ http://ftp.arnes.si/mysql/ http://ftp.astral.ro/mirrors/mysql.com/ http://ftp.gwdg.de/pub/misc/mysql/ http://ftp.heanet.ie/mirrors/www.mysql.com/ http://ftp.iij.ad.jp/pub/db/mysql/ http://ftp.itu.edu.tr/Mirror/Mysql/ http://ftp.jaist.ac.jp/pub/mysql/ http://ftp.ntua.gr/pub/databases/mysql/ http://ftp.sunet.se/pub/unix/databases/relational/mysql/ http://ftp.tpnet.pl/vol/d3/ftp.mysql.com/ http://mir2.ovh.net/ftp.mysql.com/ http://mirror.csclub.uwaterloo.ca/mysql/ http://mirror-fpt-telecom.fpt.net/mysql/ http://mirror.hostfuss.com/mysql/ http://mirror.khlug.org/mysql/ http://mirror.leaseweb.com/mysql/ http://mirror.mirimar.net/mysql/ http://mirrors.bevc.net/mysql/ http://mirrors.dedipower.com/www.mysql.com/ http://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/ http://mirrors.paknet.org/mysql/ http://mirrors.ucr.ac.cr/MySQL/ http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/ http://mirror.switch.ch/ftp/mirror/mysql/ http://mirrors.xservers.ro/mysql/ http://mysql.blic.net/ http://mysql.borsen.dk/ http://mysql.bst.lt/ http://mysql.byungsoo.net/ http://mysql.cdpa.nsysu.edu.tw/ http://mysql.cs.pu.edu.tw/ http://mysql.eukhost.com/ http://mysql.he.net/ http://mysql.infocom.ua/ http://mysql.inspire.net.nz/ http://mysql.isu.edu.tw/ http://mysql.linux.cz/ http://mysql.llarian.net/ http://mysql.mirror.ac.za/ http://mysql.mirror.easycolocate.nl/ http://mysql.mirror.kangaroot.net/ http://mysqlmirror.netandhost.in/ http://mysql.mirror.rafal.ca/ http://mysql.mirrors.adc.am/ http://mysql.mirrors.arminco.com/ http://mysql.mirrors.crysys.hit.bme.hu/ http://mysql.mirrors.enexis.hu/ http://mysql.mirrors.ilisys.com.au/ http://mysql.mirrors.webazilla.nl/ http://mysql.mirror.tw/ http://mysql.nfsi.pt/ http://mysql.online.bg/ http://mysql.oss.eznetsols.org/ http://mysql.phphosts.org/ http://mysql.proserve.nl/ http://mysql.rediris.es/ http://mysql.rhnet.is/ http://mysql.sh.cvut.cz http://mysql.skynet.be/ http://mysql.spd.co.il/ http://mysql.speedbone.de/ http://mysql.stu.edu.tw/ http://mysql.thaiweb.net/ http://na.mirror.garr.it/mirrors/MySQL/ http://opensource.become.com/mysql/ http://sunsite.icm.edu.pl/mysql/ http://sunsite.informatik.rwth-aachen.de/mysql/ http://www.mirrorservice.org/sites/ftp.mysql.com/
 nero		http://ftp5.usw.nero.com/software/NeroLINUX http://ftp6.usw.nero.com/software/NeroLINUX ftp://ftp3.usw.nero.com/software/NeroLINUX ftp://ftp4.usw.nero.com/software/NeroLINUX ftp://ftp5.usw.nero.com/software/NeroLINUX ftp://ftp6.usw.nero.com/software/NeroLINUX
 netbsd		ftp://ftp.NetBSD.org/pub/NetBSD ftp://ftp.au.NetBSD.org/pub/NetBSD ftp://ftp2.au.NetBSD.org/pub/NetBSD ftp://ftp.at.NetBSD.org/pub/NetBSD ftp://ftp.be.NetBSD.org ftp://ftp.cn.NetBSD.org/pub/NetBSD ftp://ftp.cz.NetBSD.org/pub/NetBSD ftp://ftp.dk.NetBSD.org/pub/NetBSD ftp://ftp.ee.NetBSD.org/pub/NetBSD ftp://ftp.fi.NetBSD.org/pub/NetBSD ftp://ftp2.fr.NetBSD.org/pub/NetBSD ftp://ftp4.fr.NetBSD.org/mirrors/ftp.netbsd.org ftp://ftp2.de.NetBSD.org/pub/NetBSD ftp://ftp3.de.NetBSD.org/pub/NetBSD ftp://ftp5.de.NetBSD.org/pub/NetBSD ftp://ftp6.de.NetBSD.org/pub/NetBSD ftp://ftp.gr.NetBSD.org/pub/NetBSD ftp://ftp.hu.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.jp.NetBSD.org/pub/NetBSD ftp://ftp2.jp.NetBSD.org/pub/NetBSD ftp://ftp7.jp.NetBSD.org/pub/NetBSD ftp://ftp4.jp.NetBSD.org/pub/NetBSD ftp://ftp5.jp.NetBSD.org/pub/NetBSD ftp://ftp6.jp.NetBSD.org/pub/NetBSD ftp://ftp.nl.NetBSD.org/pub/NetBSD ftp://ftp2.no.NetBSD.org/pub/NetBSD ftp://ftp.ro.NetBSD.org/pub/NetBSD ftp://ftp.ru.NetBSD.org/pub/NetBSD ftp://ftp.sk.NetBSD.org/pub/NetBSD ftp://ftp.es.NetBSD.org/pub/NetBSD ftp://ftp.se.NetBSD.org/pub/NetBSD ftp://ftp2.se.NetBSD.org/pub/NetBSD ftp://ftp.tw.NetBSD.org/pub/NetBSD ftp://ftp2.tw.NetBSD.org/pub/NetBSD ftp://ftp.uk.NetBSD.org/pub/NetBSD ftp://ftp2.us.NetBSD.org/pub/NetBSD ftp://ftp3.us.NetBSD.org/pub/NetBSD ftp://ftp4.us.NetBSD.org/pub/NetBSD ftp://ftp5.us.NetBSD.org/pub/NetBSD ftp://ftp6.us.NetBSD.org/NetBSD ftp://ftp7.us.NetBSD.org/pub/NetBSD ftp://ftp8.us.NetBSD.org/pub/NetBSD ftp://ftp.cz.NetBSD.org/pub/NetBSD ftp://ftp.dk.NetBSD.org/pub/NetBSD ftp://ftp.ee.NetBSD.org/pub/NetBSD ftp://ftp.fi.NetBSD.org/pub/NetBSD ftp://ftp2.fr.NetBSD.org/pub/NetBSD ftp://ftp4.fr.NetBSD.org/mirrors/ftp.netbsd.org ftp://ftp2.de.NetBSD.org/pub/NetBSD ftp://ftp3.de.NetBSD.org/pub/NetBSD ftp://ftp5.de.NetBSD.org/pub/NetBSD ftp://ftp6.de.NetBSD.org/pub/NetBSD ftp://ftp.gr.NetBSD.org/pub/NetBSD ftp://ftp.hu.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.ie.NetBSD.org/pub/netbsd ftp://ftp.il.NetBSD.org/pub/NetBSD ftp://ftp.jp.NetBSD.org/pub/NetBSD ftp://ftp2.jp.NetBSD.org/pub/NetBSD ftp://ftp3.jp.NetBSD.org/pub/NetBSD ftp://ftp7.jp.NetBSD.org/pub/NetBSD ftp://ftp4.jp.NetBSD.org/pub/NetBSD ftp://ftp5.jp.NetBSD.org/pub/NetBSD ftp://ftp6.jp.NetBSD.org/pub/NetBSD ftp://ftp.nl.NetBSD.org/pub/NetBSD ftp://ftp2.no.NetBSD.org/pub/NetBSD ftp://ftp.ro.NetBSD.org/pub/NetBSD ftp://ftp.ru.NetBSD.org/pub/NetBSD ftp://ftp.sk.NetBSD.org/pub/NetBSD ftp://ftp.es.NetBSD.org/pub/NetBSD ftp://ftp.se.NetBSD.org/pub/NetBSD ftp://ftp2.se.NetBSD.org/pub/NetBSD ftp://ftp.tw.NetBSD.org/pub/NetBSD ftp://ftp2.tw.NetBSD.org/pub/NetBSD ftp://ftp3.tw.NetBSD.org/pub/NetBSD ftp://ftp.uk.NetBSD.org/pub/NetBSD ftp://ftp2.us.NetBSD.org/pub/NetBSD ftp://ftp3.us.NetBSD.org/pub/NetBSD ftp://ftp4.us.NetBSD.org/pub/NetBSD ftp://ftp5.us.NetBSD.org/pub/NetBSD ftp://ftp6.us.NetBSD.org/NetBSD ftp://ftp7.us.NetBSD.org/pub/NetBSD ftp://ftp8.us.NetBSD.org/pub/NetBSD
 nongnu		http://download.savannah.nongnu.org/releases-noredirect/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.cinquix.com/pub/savannah/ ftp://mirror.cinquix.com/pub/savannah/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://mirrors.igsobe.com/nongnu/ ftp://mirrors.igsobe.com/nongnu/ http://mirror.its.uidaho.edu/pub/savannah/ ftp://mirror.its.uidaho.edu/savannah/ http://mirrors.openfountain.cl/savannah/ http://mirrors.zerg.biz/nongnu/ http://nongnu.askapache.com/ http://nongnu.mirror.ironie.org/releases/ ftp://ftp.ironie.org/savannah.nongnu.org/releases/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ http://www.very-clever.com/download/nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/ http://mirrors.aixtools.net/sv/
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3995286c1532..234f206e1e0c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2294,6 +2294,7 @@ dev-vcs/gitg:glade - Install a glade catalog file
 dev-vcs/gitolite:contrib - Install user-contributed files
 dev-vcs/gitolite:tools - Install tools to e.g. convert a Gitosis config to gitolite or one to check if your setup is gitolite >= 3.x compatible
 dev-vcs/gitolite-gentoo:contrib - Install user-contributed files
+dev-vcs/gitolite-gentoo:tools - Install tools to e.g. convert a Gitosis config to gitolite or one to check if your setup is gitolite >= 3.x compatible
 dev-vcs/mercurial:bugzilla - Support bugzilla integration.
 dev-vcs/mercurial:gpg - Support signing with GnuPG.
 dev-vcs/mercurial:tk - Install dev-lang/tk for hgk script.
@@ -2588,7 +2589,6 @@ gnome-base/gnome-extra-apps:games - Install Gnome Games
 gnome-base/gnome-extra-apps:shotwell - Install the media-gfx/shotwell photo manager
 gnome-base/gnome-extra-apps:tracker - Install the app-misc/tracker indexer and the GNOME packages that require it
 gnome-base/gnome-light:automount - Use gnome-base/gvfs[gdu] for automounting of drives in nautilus
-gnome-base/gnome-light:fallback - Install gnome-base/gnome-panel and x11-wm/metacity for the GNOME 3 fallback mode
 gnome-base/gnome-light:gnome-shell - Install gnome-base/gnome-shell and x11-wm/mutter for the standard GNOME 3 desktop mode
 gnome-base/gnome-panel:bonobo - Enable Bonobo compatibility modules for applets still not ported to DBUS.
 gnome-base/gnome-session:gconf - Optional support for gnome-base/gconf configuration storage system
@@ -2740,7 +2740,6 @@ kde-base/kdeplasma-addons:oauth - Enable OAuth support via dev-libs/qoauth
 kde-base/kdeplasma-addons:qalculate - Enable Qalculate runner using sci-libs/libqalculate
 kde-base/kdeplasma-addons:qwt - Enable applets that use x11-libs/qwt:5.
 kde-base/kdeplasma-addons:scim - Enable applets that use app-i18n/scim.
-kde-base/kdesdk-misc:extras - Build po2xml and swappo tools
 kde-base/kdeutils-meta:floppy - Install kde-base/kfloppy to format and create DOS or ext2fs filesystems in a floppy.
 kde-base/kdm:consolekit - Enables support for authorization using consolekit
 kde-base/kget:bittorrent - Enable bittorrent transfer plugin through net-libs/libktorrent
@@ -2830,7 +2829,6 @@ kde-base/smokeqt:qscintilla - Compile bindings for x11-libs/qscintilla.
 kde-base/smokeqt:qthelp - Compile bindings for QtHelp from dev-qt/qthelp.
 kde-base/smokeqt:qwt - Compile bindings for x11-libs/qwt.
 kde-base/smokeqt:webkit - Compile bindings for dev-qt/qtwebkit.
-kde-base/solid:wicd - Enable Wicd wired and wireless network manager.
 kde-base/step:qalculate - Enable the libqalculate library for unit conversion
 kde-misc/kcm-grub2:hwinfo - Used to work out supported framebuffer resolutions
 kde-misc/kcm-grub2:imagemagick - Create splash images compatible with GRUB2
@@ -6551,7 +6549,6 @@ sys-kernel/ck-sources:urwlocks - Use upgradable read/write locks in place of the
 sys-kernel/dracut:debug - Module installing additional tools like strace, file editor, ssh and more
 sys-kernel/dracut:device-mapper - Set of helper modules providing support for device mapper. You need to enable this only if emerge says so.
 sys-kernel/dracut:net - Set of helper modules providing networking support. You need to enable this only if emerge says so.
-sys-kernel/dracut:optimization - Build optimized version of dracut_install function. It will be used instead of the one written in bash.
 sys-kernel/genkernel:crypt - Obsolete USE flag. Use cryptsetup for LUKS support. (bug ##414523)
 sys-kernel/genkernel:cryptsetup - Enable support for Luks disk encryption using sys-fs/cryptsetup
 sys-kernel/genkernel-next:cryptsetup - Enable support for Luks disk enrcyption using sys-fs/cryptsetup
diff --git a/sci-biology/clustalw/clustalw-1.83-r3.ebuild b/sci-biology/clustalw/clustalw-1.83-r3.ebuild
index 398faebb98a7..820ee5015434 100644
--- a/sci-biology/clustalw/clustalw-1.83-r3.ebuild
+++ b/sci-biology/clustalw/clustalw-1.83-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw/clustalw-1.83-r3.ebuild,v 1.8 2014/01/18 20:17:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalw/clustalw-1.83-r3.ebuild,v 1.9 2014/01/19 10:31:31 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/unix/clustalw/${PN}${PV}.UNIX.tar.gz"
 
 LICENSE="clustalw"
 SLOT="1"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 S="${WORKDIR}"/${PN}${PV}
diff --git a/sci-chemistry/gromacs/gromacs-4.6.5.ebuild b/sci-chemistry/gromacs/gromacs-4.6.5.ebuild
index a02b40beda75..de7348f6190b 100644
--- a/sci-chemistry/gromacs/gromacs-4.6.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.5.ebuild,v 1.1 2013/12/05 18:10:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-4.6.5.ebuild,v 1.2 2014/01/19 10:30:04 ago Exp $
 
 EAPI=5
 
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.gromacs.org/"
 #        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
 LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmm openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}"
 
 CDEPEND="
diff --git a/sci-libs/alglib/alglib-3.7.0.ebuild b/sci-libs/alglib/alglib-3.7.0.ebuild
index 9eec1a7abd76..049d3bc8eea2 100644
--- a/sci-libs/alglib/alglib-3.7.0.ebuild
+++ b/sci-libs/alglib/alglib-3.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/alglib/alglib-3.7.0.ebuild,v 1.1 2013/06/22 12:08:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/alglib/alglib-3.7.0.ebuild,v 1.2 2014/01/19 09:38:08 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.alglib.net/translator/re/${P}.cpp.tgz"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index 9a24e3b35a8b..d5469fd3f7c4 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.10 2014/01/18 20:03:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.5.ebuild,v 1.11 2014/01/19 10:16:05 ago Exp $
 
 EAPI=3
 inherit elisp-common eutils flag-o-matic toolchain-funcs
@@ -17,7 +17,7 @@ SRC_URI="${SRC_COM}/unix/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE="doc data fltk gmp static-libs X"
 
 RDEPEND="sys-libs/readline
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
index 523b3d9197ff..0a4a6d0c5142 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.6 2013/11/18 08:05:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild,v 1.7 2014/01/19 09:38:26 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bindist doc mono latex python"
 
 LANGS="cn cz de es fr ja ro ru sv"
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
new file mode 100644
index 000000000000..c52c6d725cd9
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20130424-r4.tar.bz2 293227 SHA256 b5b115da4cc69960024cf716ca4c637591230918248976b7d359c03390964fbd SHA512 d766b2691d0a56cbe6786a29f2b2d047c7990d02823848486b48f5774ba1f403f6ff93c05f51ce586842ccf9d6b0e3efb1557c0d2d39689a2d536075e1b0e1dd WHIRLPOOL 6acdab5db1baeadee838995d92c9cfb2de153c2e1d5512d74aecbd0ae4789b297f433ca83114231f0b7c636fc7122d48245b291d1560fcdd6df6c4a2f542ac37
+DIST refpolicy-2.20130424.tar.bz2 649845 SHA256 6039ba854f244a39dc727cc7db25632f7b933bb271c803772d754d4354f5aef4 SHA512 82ab38bc3425eb4b7d50c42564ebc28603e32e6f3266da164502f0cdc3a2f6bfe457518297824cb78f6f94211f9823fbc7254bb9e1d9df1cc7f284d326299705 WHIRLPOOL ba7539261a072d33e34afb940a1899ccdb2493c3b11eea3b166b9eb565478fd93cf580d09ef016f799a5dd5a4452086a623f9b3f38fbfb9a812e6e31bcd68e25
diff --git a/sec-policy/selinux-cachefilesd/metadata.xml b/sec-policy/selinux-cachefilesd/metadata.xml
new file mode 100644
index 000000000000..11307c1424b4
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for cachefilesd</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20130424-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20130424-r4.ebuild
new file mode 100644
index 000000000000..208963674340
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20130424-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20130424-r4.ebuild,v 1.2 2014/01/19 19:25:26 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cachefilesd"
+BASEPOL="2.20130424-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
new file mode 100644
index 000000000000..ca9a94910873
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild,v 1.1 2014/01/19 19:23:44 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="cachefilesd"
+BASEPOL="9999"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+KEYWORDS=""
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 463ddf799f8b..13c9f9fa3536 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -2,3 +2,4 @@ DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390
 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3
 DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c
 DIST busybox-1.22.0.tar.bz2 2218120 SHA256 92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53 SHA512 75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66 WHIRLPOOL 055aba8e8d116f664f61458f32c31c08bfdb0db97934eb00af02098981e25665aff16e9a371234a6859e4954d1568603a99ca7d6925cd42a27e7dae30523514f
+DIST busybox-1.22.1.tar.bz2 2218650 SHA256 ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 WHIRLPOOL 8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8
diff --git a/sys-apps/busybox/busybox-1.22.1.ebuild b/sys-apps/busybox/busybox-1.22.1.ebuild
new file mode 100644
index 000000000000..84ffb88b364d
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.22.1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1.ebuild,v 1.1 2014/01/20 06:34:35 vapier Exp $
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="4"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${PN}
+	EGIT_REPO_URI="git://busybox.net/busybox.git"
+	inherit git-2
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
+RESTRICT="test"
+
+RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	while [[ $# -gt 0 ]] ; do
+		if [[ ${flag} == "y" ]] ; then
+			sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
+		else
+			sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
+		fi
+		einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+	#epatch "${FILESDIR}"/${P}-*.patch
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 allyesconfig > /dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option n HUSH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+	fi
+
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	busybox_config_option $(usex static n pam) PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.rc.1 mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/debianutils/debianutils-4.4.ebuild b/sys-apps/debianutils/debianutils-4.4.ebuild
index 14c7cc4e0680..6699f829d279 100644
--- a/sys-apps/debianutils/debianutils-4.4.ebuild
+++ b/sys-apps/debianutils/debianutils-4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-4.4.ebuild,v 1.10 2014/01/18 20:14:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-4.4.ebuild,v 1.11 2014/01/19 10:26:46 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )"
diff --git a/sys-apps/elfix/elfix-0.8.4.ebuild b/sys-apps/elfix/elfix-0.8.4.ebuild
index e77e696e4295..3af573d1edf4 100644
--- a/sys-apps/elfix/elfix-0.8.4.ebuild
+++ b/sys-apps/elfix/elfix-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/elfix-0.8.4.ebuild,v 1.6 2014/01/18 20:08:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/elfix-0.8.4.ebuild,v 1.7 2014/01/19 11:34:07 pacho Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="+ptpax +xtpax"
 
 REQUIRED_USE="|| ( ptpax xtpax )"
diff --git a/sys-apps/ethtool/ethtool-3.12.1.ebuild b/sys-apps/ethtool/ethtool-3.12.1.ebuild
index 5279ee6ac1e6..07d5769408d6 100644
--- a/sys-apps/ethtool/ethtool-3.12.1.ebuild
+++ b/sys-apps/ethtool/ethtool-3.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.12.1.ebuild,v 1.7 2014/01/18 20:14:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.12.1.ebuild,v 1.8 2014/01/19 10:26:59 ago Exp $
 
 EAPI="4"
 
@@ -10,6 +10,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 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"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
index 2683d3db16ae..054f3dd4eb23 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild,v 1.6 2014/01/07 09:36:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild,v 1.7 2014/01/19 19:36:35 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/systemd-207"
diff --git a/sys-apps/help2man/help2man-1.43.3.ebuild b/sys-apps/help2man/help2man-1.43.3.ebuild
index 2ca3abc72299..0fc8f79337e7 100644
--- a/sys-apps/help2man/help2man-1.43.3.ebuild
+++ b/sys-apps/help2man/help2man-1.43.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.43.3.ebuild,v 1.8 2014/01/18 20:17:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.43.3.ebuild,v 1.9 2014/01/19 10:31:45 ago Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls elibc_glibc"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwloc/hwloc-1.6.1.ebuild b/sys-apps/hwloc/hwloc-1.6.1.ebuild
index 3aff99e3340e..4671f56fb56e 100644
--- a/sys-apps/hwloc/hwloc-1.6.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.6.1.ebuild,v 1.8 2014/01/12 13:15:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.6.1.ebuild,v 1.9 2014/01/19 13:46:48 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="cairo debug +numa +pci plugins svg static-libs xml X"
 
 RDEPEND="sys-libs/ncurses
diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
index c503d32def33..95c1ec7fb5ad 100644
--- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.9 2014/01/18 05:12:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.10 2014/01/19 10:29:10 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86"
 IUSE="nls pam"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/sys-apps/kmod/kmod-15.ebuild b/sys-apps/kmod/kmod-15.ebuild
index 36c144885f5e..e7bee17f4bf1 100644
--- a/sys-apps/kmod/kmod-15.ebuild
+++ b/sys-apps/kmod/kmod-15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.8 2013/12/27 21:40:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.11 2014/01/19 19:39:17 ago Exp $
 
 EAPI=5
 inherit autotools eutils libtool multilib toolchain-funcs versionator
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
diff --git a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
index efab37509fec..798da7f6479a 100644
--- a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild,v 1.8 2014/01/18 20:14:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild,v 1.9 2014/01/19 10:27:12 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/man-db/man-db-2.6.5.ebuild b/sys-apps/man-db/man-db-2.6.5.ebuild
index 0a537b7d108e..13a6a328d134 100644
--- a/sys-apps/man-db/man-db-2.6.5.ebuild
+++ b/sys-apps/man-db/man-db-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.5.ebuild,v 1.11 2014/01/18 20:15:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.5.ebuild,v 1.12 2014/01/19 10:27:25 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="berkdb +gdbm nls selinux static-libs zlib"
 
 RDEPEND="dev-libs/libpipeline
diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild
index 284dbf818dca..5762a36e4e00 100644
--- a/sys-apps/openrc/openrc-0.12.4.ebuild
+++ b/sys-apps/openrc/openrc-0.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.9 2014/01/18 09:10:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.12 2014/01/19 19:38:11 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.37.ebuild b/sys-apps/sg3_utils/sg3_utils-1.37.ebuild
index f6671e28f6a5..f578e0abc40b 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.37.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.37.ebuild,v 1.10 2014/01/18 20:15:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.37.ebuild,v 1.11 2014/01/19 10:27:38 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="GPL-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="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/systemd/systemd-208-r2.ebuild b/sys-apps/systemd/systemd-208-r2.ebuild
index 64de13b49cae..12b3923c98a0 100644
--- a/sys-apps/systemd/systemd-208-r2.ebuild
+++ b/sys-apps/systemd/systemd-208-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.12 2014/01/07 09:41:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.13 2014/01/19 12:01:36 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
 	+kmod lzma pam policykit python qrcode selinux tcpd test
 	vanilla xattr"
diff --git a/sys-apps/which/which-2.20-r1.ebuild b/sys-apps/which/which-2.20-r1.ebuild
index 9dc8f2f298be..1cf444292e74 100644
--- a/sys-apps/which/which-2.20-r1.ebuild
+++ b/sys-apps/which/which-2.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.20-r1.ebuild,v 1.13 2014/01/18 03:28:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.20-r1.ebuild,v 1.14 2014/01/19 10:27:51 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-auth/keystone/files/keystone.confd b/sys-auth/keystone/files/keystone.confd
index 670ec22b3757..669fa0a7ad11 100644
--- a/sys-auth/keystone/files/keystone.confd
+++ b/sys-auth/keystone/files/keystone.confd
@@ -1,3 +1,3 @@
-CONFIG_FILE=/etc/keystone/keystone.conf
-LOG_FILE=/var/log/keystone/keystone.log
-PID_PATH=/var/run/keystone
+#KEYSTONE_CONF=/etc/keystone/keystone.conf
+#KEYSTONE_USER=keystone
+KEYSTONE_ARGS="--logfile /var/log/keystone/keystone.log"
diff --git a/sys-auth/keystone/files/keystone.initd b/sys-auth/keystone/files/keystone.initd
index f7c4acd01626..c6eca47e2355 100644
--- a/sys-auth/keystone/files/keystone.initd
+++ b/sys-auth/keystone/files/keystone.initd
@@ -1,56 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.3 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.4 2014/01/20 06:08:12 prometheanfire Exp $
 
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+description="Starts both the service and administrative APIs in a single process to provide catalog, authorization, and authentication services for OpenStack"
 
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	. /etc/conf.d/$BASENAME
-
-	if [ ! -r ${CONFIG_FILE} ]; then
-		eerror "No keystone config file found: ${CONFIG_FILE})"
-		return 1
-	fi
-
-	return 0
-}
+command=/usr/bin/keystone-all
+pidfile=/var/run/keystone.pid
+required_files="${KEYSTONE_CONF:-/etc/keystone/keystone.conf}"
 
+start_stop_daemon_args="--background --make-pidfile --user ${KEYSTONE_USER:-keystone}"
+command_args="${KEYSTONE_ARGS}"
 
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE}
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
-	eend $? "Failed to stop ${SVCNAME}"
+depend() {
+	need net
 }
-
-#restart() {
-#
-#}
diff --git a/sys-auth/keystone/files/keystone.initd.havana b/sys-auth/keystone/files/keystone.initd.havana
deleted file mode 100644
index 44be4b82f124..000000000000
--- a/sys-auth/keystone/files/keystone.initd.havana
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd.havana,v 1.1 2013/12/13 17:31:30 prometheanfire Exp $
-
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	. /etc/conf.d/$BASENAME
-
-	if [ ! -r ${CONFIG_FILE} ]; then
-		eerror "No keystone config file found: ${CONFIG_FILE})"
-		return 1
-	fi
-
-	return 0
-}
-
-
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --user keystone \
-		--make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE}
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/sys-auth/keystone/keystone-2013.1.4-r1.ebuild b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
similarity index 93%
rename from sys-auth/keystone/keystone-2013.1.4-r1.ebuild
rename to sys-auth/keystone/keystone-2013.1.4-r2.ebuild
index 536b0ec305fe..41189ad0e4a6 100644
--- a/sys-auth/keystone/keystone-2013.1.4-r1.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4-r1.ebuild,v 1.1 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4-r2.ebuild,v 1.2 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/keystone"
 SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="grizzly"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -82,8 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
diff --git a/sys-auth/keystone/keystone-2013.1.9999.ebuild b/sys-auth/keystone/keystone-2013.1.9999.ebuild
index f9621d0fac56..cc8ef4e2e284 100644
--- a/sys-auth/keystone/keystone-2013.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.9999.ebuild,v 1.8 2013/09/27 01:43:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.9999.ebuild,v 1.10 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/openstack/keystone.git"
 EGIT_BRANCH="stable/grizzly"
 
 LICENSE="Apache-2.0"
-SLOT="grizzly"
+SLOT="0"
 KEYWORDS=""
 IUSE="+sqlite mysql postgres ldap"
 #IUSE="+sqlite mysql postgres ldap test"
@@ -82,8 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
diff --git a/sys-auth/keystone/keystone-2013.2.1.ebuild b/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
similarity index 95%
rename from sys-auth/keystone/keystone-2013.2.1.ebuild
rename to sys-auth/keystone/keystone-2013.2.1-r1.ebuild
index 029b7ff30905..a072f2647111 100644
--- a/sys-auth/keystone/keystone-2013.2.1.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.1.ebuild,v 1.5 2014/01/08 06:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.1-r1.ebuild,v 1.2 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/keystone"
 SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="havana"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -98,14 +98,13 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
 	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
 
-	fowners keystone:keystone /var/run/keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /etc/keystone /var/log/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-2013.2.9999.ebuild b/sys-auth/keystone/keystone-2013.2.9999.ebuild
index c2cd99ae1275..405d807fb031 100644
--- a/sys-auth/keystone/keystone-2013.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.8 2014/01/18 06:34:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.10 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 
@@ -100,14 +100,13 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
 	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
 
-	fowners keystone:keystone /var/run/keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /etc/keystone /var/log/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index c723a0e4bb8c..d7d253fc6b6b 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-9999.ebuild
@@ -1,78 +1,98 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.12 2013/11/28 04:51:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.14 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
-#test restricted becaues of bad requirements given (old webob for instance)
-RESTRICT="test"
+
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 distutils-r1
+inherit git-2 distutils-r1 user
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python."
 HOMEPAGE="https://launchpad.net/keystone"
 EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
-SLOT="git-head"
-KEYWORDS=""
-IUSE="+sqlite mysql postgres ldap"
-#IUSE="+sqlite mysql postgres ldap test"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #todo, seperate out rdepend via use flags
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/eventlet[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.2.1[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-0.3[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/Babel
+			dev-python/decorator
+			dev-python/eventlet
+			dev-python/greenlet
+			dev-python/httplib2
+			dev-python/iso8601
+			dev-python/lxml
+			dev-python/netifaces
+			dev-python/nose
+			dev-python/nosexcover
+			dev-python/passlib
+			dev-python/paste
+			dev-python/pastedeploy
+			dev-python/python-pam
+			dev-python/repoze-lru
+			dev-python/routes
+			dev-python/sphinx
+			>=dev-python/sqlalchemy-migrate-0.7
+			dev-python/tempita
+			>=dev-python/webob-1.0.8
+			dev-python/webtest
+			dev-python/python-memcached )
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<dev-python/webob-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	>=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
-	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	virtual/python-argparse[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
 	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
 	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
-#	test? ( dev-python/Babel
-#			dev-python/decorator
-#			dev-python/eventlet
-#			dev-python/greenlet
-#			dev-python/httplib2
-#			dev-python/iso8601
-#			dev-python/lxml
-#			dev-python/netifaces
-#			dev-python/nose
-#			dev-python/nosexcover
-#			dev-python/passlib
-#			dev-python/paste
-#			dev-python/pastedeploy
-#			dev-python/python-pam
-#			dev-python/repoze-lru
-#			dev-python/routes
-#			dev-python/sphinx
-#			>=dev-python/sqlalchemy-migrate-0.7
-#			dev-python/tempita
-#			>=dev-python/webob-1.0.8
-#			dev-python/webtest
-#			)
-#PATCHES=( "${FILESDIR}"/keystone_test-requires.patch )
-#
-#python_test() {
-#	"${PYTHON}" setup.py nosetests || die
-#}
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+	>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.0[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignore (naughty) test_.py files & 1 test that connect to the network
+	nosetests -I 'test_keystoneclient*' \
+		-e test_import || die "testsuite failed under python2.7"
+}
 
 python_install() {
 	distutils-r1_python_install
@@ -80,9 +100,31 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/run/keystone /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
+	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+
+	fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
 }
diff --git a/sys-auth/munge/munge-0.5.10-r1.ebuild b/sys-auth/munge/munge-0.5.10-r1.ebuild
index 865994dfc853..d3ec46c4fbaa 100644
--- a/sys-auth/munge/munge-0.5.10-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10-r1.ebuild,v 1.10 2014/01/12 13:15:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10-r1.ebuild,v 1.11 2014/01/19 13:46:51 ago Exp $
 
 EAPI=4
 inherit user
@@ -11,7 +11,7 @@ SRC_URI="http://munge.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gcrypt"
 
 DEPEND="app-arch/bzip2
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
index 909672a577d6..9bc9da65ce3f 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild,v 1.6 2014/01/15 10:23:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild,v 1.7 2014/01/19 10:36:02 ago Exp $
 
 EAPI=5
 inherit fixheadtails eutils multilib autotools prefix
@@ -13,7 +13,7 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux"
 
 DEPEND=">=net-nds/openldap-2.1.30-r5
 		sasl? ( dev-libs/cyrus-sasl )
diff --git a/sys-auth/skey/skey-1.1.5-r8.ebuild b/sys-auth/skey/skey-1.1.5-r8.ebuild
index 8a7a70246952..a4e1ed0b10aa 100644
--- a/sys-auth/skey/skey-1.1.5-r8.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/skey-1.1.5-r8.ebuild,v 1.11 2012/11/04 20:24:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/skey-1.1.5-r8.ebuild,v 1.12 2014/01/19 20:08:26 vapier Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="BSD MIT RSA BEER-WARE"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="dev-lang/perl
diff --git a/sys-block/aoetools/aoetools-36.ebuild b/sys-block/aoetools/aoetools-36.ebuild
index 85a5e3a54adb..5e6e3c1bd059 100644
--- a/sys-block/aoetools/aoetools-36.ebuild
+++ b/sys-block/aoetools/aoetools-36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/aoetools/aoetools-36.ebuild,v 1.4 2014/01/14 15:31:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/aoetools/aoetools-36.ebuild,v 1.5 2014/01/19 10:28:04 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DOCS="NEWS README"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
index 184b504cf31f..9b91f440a80b 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild,v 1.5 2014/01/18 19:25:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild,v 1.6 2014/01/19 10:36:46 ago Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="debug slp"
 DEPEND="slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild
index c3322cb5a597..43c8bfbf13ce 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild,v 1.4 2013/12/26 19:01:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8-r1.ebuild,v 1.5 2014/01/19 11:24:16 pacho Exp $
 
 EAPI=5
 inherit autotools
@@ -12,7 +12,7 @@ SRC_URI="http://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${P}${EXT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-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="test"
 
 RDEPEND="dev-libs/expat"
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild
index ddd1c30428ec..6a2147468fb7 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild,v 1.7 2014/01/14 21:08:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.2.8.ebuild,v 1.10 2014/01/19 10:56:13 ago Exp $
 
 EAPI=5
 inherit autotools
@@ -12,7 +12,7 @@ SRC_URI="http://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${P}${EXT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-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=""
 
 # || ( ) is a non-future proof workaround for Portage unefficiency wrt #477050
diff --git a/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild
index 9b2fde8d068f..cc721b731fd3 100644
--- a/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild,v 1.2 2014/01/19 02:27:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libcircle/libcircle-0.1.0_rc1.ebuild,v 1.3 2014/01/19 19:27:26 ottxor Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ else
 	[[ ${PV} = *rc* ]] && MY_PV="${PV%%_rc*}-rc.${PV#*_rc}" || MY_PV="${PV}"
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/hpc/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="an API for distributing embarrassingly parallel workloads using self-stabilization"
diff --git a/sys-cluster/swift/files/CVE-2014-0006-havana.diff b/sys-cluster/swift/files/CVE-2014-0006-havana.diff
new file mode 100644
index 000000000000..e0c0634f6e1c
--- /dev/null
+++ b/sys-cluster/swift/files/CVE-2014-0006-havana.diff
@@ -0,0 +1,51 @@
+commit 6c378b4b65524ea3b485c47d829ed0aebbdb86c0
+Author: Samuel Merritt <sam@swiftstack.com>
+Date:   Fri Jan 3 09:26:11 2014 -0800
+
+    Backported tempurl const time compare for 1.10.0
+    
+    Change-Id: I6db8f9a568dab8403ed74a83ba0c9548f06425e1
+
+diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py
+index ffc1431..ae2f4a1 100644
+--- a/swift/common/middleware/tempurl.py
++++ b/swift/common/middleware/tempurl.py
+@@ -98,7 +98,7 @@ from urlparse import parse_qs
+ 
+ from swift.proxy.controllers.base import get_account_info
+ from swift.common.swob import HeaderKeyDict
+-from swift.common.utils import split_path
++from swift.common.utils import split_path, streq_const_time
+ 
+ 
+ #: Default headers to remove from incoming requests. Simply a whitespace
+@@ -267,17 +267,20 @@ class TempURL(object):
+         if not keys:
+             return self._invalid(env, start_response)
+         if env['REQUEST_METHOD'] == 'HEAD':
+-            hmac_vals = self._get_hmacs(env, temp_url_expires, keys,
+-                                        request_method='GET')
+-            if temp_url_sig not in hmac_vals:
+-                hmac_vals = self._get_hmacs(env, temp_url_expires, keys,
+-                                            request_method='PUT')
+-                if temp_url_sig not in hmac_vals:
+-                    return self._invalid(env, start_response)
++            hmac_vals = (self._get_hmacs(env, temp_url_expires, keys,
++                                         request_method='GET') +
++                         self._get_hmacs(env, temp_url_expires, keys,
++                                         request_method='PUT'))
+         else:
+             hmac_vals = self._get_hmacs(env, temp_url_expires, keys)
+-            if temp_url_sig not in hmac_vals:
+-                return self._invalid(env, start_response)
++
++        # While it's true that any() will short-circuit, this doesn't affect
++        # the timing-attack resistance since the only way this will
++        # short-circuit is when a valid signature is passed in.
++        is_valid_hmac = any(streq_const_time(temp_url_sig, h)
++                            for h in hmac_vals)
++        if not is_valid_hmac:
++            return self._invalid(env, start_response)
+         self._clean_incoming_headers(env)
+         env['swift.authorize'] = lambda req: None
+         env['swift.authorize_override'] = True
diff --git a/sys-cluster/swift/files/CVE-2014-0006-master.diff b/sys-cluster/swift/files/CVE-2014-0006-master.diff
new file mode 100644
index 000000000000..bf545908434b
--- /dev/null
+++ b/sys-cluster/swift/files/CVE-2014-0006-master.diff
@@ -0,0 +1,28 @@
+diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py
+index c9b9d94..5748694 100644
+--- a/swift/common/middleware/tempurl.py
++++ b/swift/common/middleware/tempurl.py
+@@ -106,7 +106,7 @@ from urlparse import parse_qs
+ from swift.proxy.controllers.base import get_account_info
+ from swift.common.swob import HeaderKeyDict, HTTPUnauthorized
+ from swift.common.utils import split_path, get_valid_utf8_str, \
+-    register_swift_info, get_hmac
++    register_swift_info, get_hmac, streq_const_time
+ 
+ 
+ #: Default headers to remove from incoming requests. Simply a whitespace
+@@ -284,7 +284,13 @@ class TempURL(object):
+                                 request_method='PUT'))
+         else:
+             hmac_vals = self._get_hmacs(env, temp_url_expires, keys)
+-        if temp_url_sig not in hmac_vals:
++
++        # While it's true that any() will short-circuit, this doesn't affect
++        # the timing-attack resistance since the only way this will
++        # short-circuit is when a valid signature is passed in.
++        is_valid_hmac = any(streq_const_time(temp_url_sig, hmac)
++                            for hmac in hmac_vals)
++        if not is_valid_hmac:
+             return self._invalid(env, start_response)
+         self._clean_incoming_headers(env)
+         env['swift.authorize'] = lambda req: None
diff --git a/sys-cluster/swift/swift-1.10.0.ebuild b/sys-cluster/swift/swift-1.10.0-r1.ebuild
similarity index 95%
rename from sys-cluster/swift/swift-1.10.0.ebuild
rename to sys-cluster/swift/swift-1.10.0-r1.ebuild
index 1747ea78b10f..6e44a87e9042 100644
--- a/sys-cluster/swift/swift-1.10.0.ebuild
+++ b/sys-cluster/swift/swift-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.10.0.ebuild,v 1.4 2014/01/08 05:59:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.10.0-r1.ebuild,v 1.1 2014/01/20 05:41:12 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -49,6 +49,8 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
 ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
 ~ZFS"
 
+PATCHES=( "${FILESDIR}/CVE-2014-0006-havana.diff" )
+
 pkg_setup() {
 	enewuser swift
 	enewgroup swift
@@ -57,12 +59,13 @@ pkg_setup() {
 src_prepare() {
 	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
 	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
+	distutils-r1_python_prepare_all
 }
 
 src_test () {
 	# https://bugs.launchpad.net/swift/+bug/1249727
 	find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
-	sh .unittests || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 sh .unittests || die
 }
 
 python_install() {
diff --git a/sys-cluster/swift/swift-1.11.0.ebuild b/sys-cluster/swift/swift-1.11.0-r1.ebuild
similarity index 93%
rename from sys-cluster/swift/swift-1.11.0.ebuild
rename to sys-cluster/swift/swift-1.11.0-r1.ebuild
index 8800b9f22215..b2bc8d26c74c 100644
--- a/sys-cluster/swift/swift-1.11.0.ebuild
+++ b/sys-cluster/swift/swift-1.11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.11.0.ebuild,v 1.2 2014/01/08 05:59:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.11.0-r1.ebuild,v 1.1 2014/01/20 05:41:12 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -49,6 +49,8 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
 ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
 ~ZFS"
 
+PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
+
 pkg_setup() {
 	enewuser swift
 	enewgroup swift
@@ -57,12 +59,13 @@ pkg_setup() {
 src_prepare() {
 	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
 	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
+	distutils-r1_python_prepare_all
 }
 
 src_test () {
 	# https://bugs.launchpad.net/swift/+bug/1249727
 	find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
-	sh .unittests || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 sh .unittests || die
 }
 
 python_install() {
@@ -71,7 +74,7 @@ python_install() {
 	insinto /etc/swift
 
 	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
+#	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
 	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
 	newins "etc/mime.types-sample" "mime.types-sample"
 	newins "etc/memcache.conf-sample" "memcache.conf-sample"
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 163208625b6c..c49bf7ac91d9 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,2 @@
-DIST torque-2.4.16.tar.gz 5705768 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d SHA512 481d76b08f4d22704f858d490fd7cd1f8be2d41e2b5969df299c50f0acdf6a1763be2d0debb8a6bd77bd8b9747b9c3c666d701b2b75d8aaf150e10c1081c3be5 WHIRLPOOL 6e89a4e9ac3fd7fdf8b3d38568302a02bfb1aea0203786bade4bb03aaa2fda7f4bbfb2664be5d203d6984f5676980e77035140f41bf00065bd27e9acd38f227c
 DIST torque-2.5.12.tar.gz 5862988 SHA256 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b SHA512 12615e412bf90b4248f76e28627ece21116969e4f009629598482ec4432a5e8b6b10ce695e3abc1e3ac43fa2325b5e04b176316ef3c21e4795cb610101f9afae WHIRLPOOL 57b636b34fd72967304babe11340852c0d06519d60705ac088483831b688517104a7ef064dd7b0375cfc35f093858754f65a9f4fd026a65ead85d0544323d682
 DIST torque-4.1.5.1.tar.gz 6214726 SHA256 10fa10625256d26e9371abbc98ca8ecf307ccc2ef117e32a0bf806de105037dd SHA512 630b4a9c7d9d6b14bc807dfba868e78894856d24e7b10703c76b519edf78876e33ef158edd6dd8abeb3ffb6bfe8036e74eff23501d476ef9ebe817b46d2e3c5c WHIRLPOOL 6709a3eec73f39c27d4dd02ab62d74448a93a442bdf585d5f244142de8f54b42fdd841c773226589de4c3e0a9c881bdd51d4c04bf57235136086cab18dd6fa42
diff --git a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
deleted file mode 100644
index 8505787062ab..000000000000
--- a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d29ba6daadde49d4e2325b415f2fe614bd2cbad1 Mon Sep 17 00:00:00 2001
-From: Kacper Kowalik <xarthisius@gentoo.org>
-Date: Tue, 16 Nov 2010 16:23:14 -0500
-Subject: [PATCH 1/4] fix parallel doc install
-
-man7/pbs_resources_irix5.7 was defined twice.
-
-Thanks to Kacper Kowalik <xarthisius@gentoo.org>
----
- doc/Makefile.am |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 797b4d6..d4b474c 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,7 +33,6 @@ EXTRA_DIST = man1/qalter.1.in man1/qdel.1.in man1/qhold.1.in man1/qmove.1.in \
- 	     man7/pbs_resources_fujitsu.7.in \
- 	     man7/pbs_resources_hpux10.7.in man7/pbs_resources_irix5.7.in \
- 	     man7/pbs_resources_hpux11.7.in \
--	     man7/pbs_resources_irix5.7.in \
- 	     man7/pbs_resources_irix6.7.in man7/pbs_resources_irix6array.7.in \
- 	     man7/pbs_resources_linux.7.in man7/pbs_resources_netbsd.7.in \
- 	     man7/pbs_resources_solaris5.7.in man7/pbs_resources_solaris7.7.in \
-@@ -79,7 +78,6 @@ nodist_man7_MANS = man7/pbs_job_attributes.7 man7/pbs_queue_attributes.7 \
- 		   man7/pbs_resources_freebsd.7 man7/pbs_resources_fujitsu.7 \
- 		   man7/pbs_resources_hpux10.7 man7/pbs_resources_irix5.7 \
- 		   man7/pbs_resources_hpux11.7 \
--		   man7/pbs_resources_irix5.7 \
- 		   man7/pbs_resources_irix6.7 man7/pbs_resources_irix6array.7 \
- 		   man7/pbs_resources_linux.7 man7/pbs_resources_netbsd.7 \
- 		   man7/pbs_resources_solaris5.7 man7/pbs_resources_solaris7.7 \
--- 
-1.7.2.2
-
diff --git a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
deleted file mode 100644
index 49bf1f9a8602..000000000000
--- a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7a60464264bafb27c4bbaab39744b267d671f41b Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 16 Nov 2010 16:31:25 -0500
-Subject: [PATCH 2/3] fix implicit declaration warnings
-
-vasprintf and asprintf require _GNU_SOURCE.
-
-Thanks to Kacper Kowalik <xarthisius@gentoo.org>
----
- src/drmaa/src/error.c  |    1 +
- src/drmaa/src/submit.c |    1 +
- src/drmaa/src/wait.c   |    1 +
- 3 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/drmaa/src/error.c b/src/drmaa/src/error.c
-index b848041..4a65b47 100644
---- a/src/drmaa/src/error.c
-+++ b/src/drmaa/src/error.c
-@@ -23,6 +23,7 @@
- # include <pbs_config.h>
- #endif
- 
-+#define _GNU_SOURCE // asprintf
- #include <unistd.h>
- 
- #include <stdio.h>
-diff --git a/src/drmaa/src/submit.c b/src/drmaa/src/submit.c
-index e9b404c..9f06620 100644
---- a/src/drmaa/src/submit.c
-+++ b/src/drmaa/src/submit.c
-@@ -23,6 +23,7 @@
- # include <pbs_config.h>
- #endif
- 
-+#define _GNU_SOURCE
- #include <sys/stat.h>
- #include <unistd.h>
- #include <limits.h>
-diff --git a/src/drmaa/src/wait.c b/src/drmaa/src/wait.c
-index ecb2ed4..2ef7600 100644
---- a/src/drmaa/src/wait.c
-+++ b/src/drmaa/src/wait.c
-@@ -23,6 +23,7 @@
- # include <pbs_config.h>
- #endif
- 
-+#define _GNU_SOURCE // vasprintf
- #include <assert.h>
- #include <limits.h>
- #include <signal.h>
--- 
-1.7.2.2
-
diff --git a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
deleted file mode 100644
index 43632c3f2115..000000000000
--- a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7351d31442fcf324b7f7769911af8a98368506e2 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 16 Nov 2010 17:03:13 -0500
-Subject: [PATCH 3/3] disable automagic doc building
-
-Instead of unconditionally building docs if doxygen is found, only build
-at the request of the user.
----
- configure.ac |   19 +++++++++++++------
- 1 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 480e23e..a8182cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1237,8 +1237,6 @@ dnl
- if test "$build_drmaa" = "yes" ;then
- AC_MSG_NOTICE([Configuring DRMAA ...])
- AC_PATH_PROG(GPERF, "gperf")
--AX_PROG_DOT
--AC_PATH_PROG(DOXYGEN, "doxygen", "none")
- AC_C_BIGENDIAN_CROSS
- ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])])
- 
-@@ -1282,10 +1280,19 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
-   AC_MSG_RESULT([no])
- ])
- 
-- build_drmaa_docs=yes
--else  
--  DOXYGEN=none
-- build_drmaa_docs=no
-+AC_ARG_ENABLE([apidocs],
-+    AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation])
-+)
-+AS_IF([test "x$enable_apidocs" = "xyes"],
-+    [ AX_PROG_DOT
-+      AC_PATH_PROG(DOXYGEN, "doxygen", "none")
-+      build_drmaa_docs=yes ],
-+    [ build_drmaa_docs=no
-+      DOXYGEN=none ]
-+)
-+else
-+    DOXYGEN="none"
-+    build_drmaa_docs=no
- fi
- AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
- AC_SUBST(build_drmaa_docs)
--- 
-1.7.2.2
-
diff --git a/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch b/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch
deleted file mode 100644
index 1b57fe6133b1..000000000000
--- a/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 301ac38e30138b2b337391a64d0770ca6a6eb468 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Sat, 25 Jun 2011 21:07:41 -0400
-Subject: [PATCH] disable automagic doc building
-
-Instead of unconditionally building docs if doxygen is found, only build
-at the request of the user.
----
- configure.ac |   23 +++++++++++++++--------
- 1 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8624a5f..2999094 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1323,8 +1323,6 @@ dnl
- if test "$build_drmaa" = "yes" ;then
- AC_MSG_NOTICE([Configuring DRMAA ...])
- AC_PATH_PROG(GPERF, "gperf")
--AX_PROG_DOT
--AC_PATH_PROG(DOXYGEN, "doxygen", "none")
- AC_C_BIGENDIAN_CROSS
- ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])])
- 
-@@ -1368,12 +1366,21 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
-   AC_MSG_RESULT([no])
- ])
- 
--  build_drmaa_docs=yes
--  RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
--else  
--  DOXYGEN=none
--  build_drmaa_docs=no
--  RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
-+AC_ARG_ENABLE([apidocs],
-+    AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation])
-+)
-+AS_IF([test "x$enable_apidocs" = "xyes"],
-+    [ AX_PROG_DOT
-+      AC_PATH_PROG(DOXYGEN, "doxygen", "none")
-+      RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
-+      build_drmaa_docs=yes ],
-+    [ build_drmaa_docs=no
-+      DOXYGEN=none ]
-+)
-+else
-+    DOXYGEN="none"
-+    build_drmaa_docs=no
-+    RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
- fi
- AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
- AC_SUBST(build_drmaa_docs)
--- 
-1.7.3.4
-
diff --git a/sys-cluster/torque/torque-2.4.16-r1.ebuild b/sys-cluster/torque/torque-2.4.16-r1.ebuild
deleted file mode 100644
index 5caa85c2c44e..000000000000
--- a/sys-cluster/torque/torque-2.4.16-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16-r1.ebuild,v 1.1 2013/12/23 18:01:35 jsbronder Exp $
-
-EAPI=2
-WANT_AUTOMAKE="1.12"
-inherit flag-o-matic eutils linux-info autotools
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tk +crypt drmaa server +syslog doc cpusets kernel_linux"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	doc? ( drmaa? (
-		|| ( <app-doc/doxygen-1.7.6.1[latex,-nodot]	>=app-doc/doxygen-1.7.6.1[latex,dot] )
-	) )
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	# Find a Torque server to use.  Check environment, then
-	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
-		else
-			PBS_SERVER_NAME=$(hostname -f)
-		fi
-	fi
-
-	USE_CPUSETS="--disable-cpuset"
-	if use cpusets; then
-		if ! use kernel_linux; then
-			einfo
-			elog "    Torque currently only has support for cpusets in linux."
-			elog "Assuming you didn't really want this USE flag."
-			einfo
-		else
-			linux-info_pkg_setup
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
-				einfo
-				elog "    Torque support for cpusets will require that you recompile"
-				elog "your kernel with CONFIG_CPUSETS enabled."
-				einfo
-			fi
-			USE_CPUSETS="--enable-cpuset"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-
-	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
-	epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch
-	epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch
-
-	sed -i \
-		-e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \
-		-e 's,\(GENERATE_MAN *=\).*,\1 NO,' \
-		src/drmaa/Doxyfile.in || die
-	sed -i \
-		-e '/INSTALL_DATA/d' \
-		src/drmaa/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	if use drmaa && use doc; then
-		myconf="${myconf} --enable-apidocs"
-	else
-		myconf="${myconf} --disable-apidocs"
-	fi
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf}
-}
-
-# WARNING
-# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
-# just fall over with the error message, but in some spots it will just ignore
-# you and fail strangely. Likewise it also barfs on our .keep files!
-pbs_createspool() {
-	local root="$1"
-	local s="$(dirname "${PBS_SERVER_HOME}")"
-	local h="${PBS_SERVER_HOME}"
-	local sp="${h}/server_priv"
-	einfo "Building spool directory under ${D}${h}"
-	local a d m
-	local dir_spec="
-			0755:${h}/aux 0700:${h}/checkpoint
-			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
-			1777:${h}/spool 1777:${h}/undelivered"
-
-	if use server; then
-		dir_spec="${dir_spec} 0755:${h}/sched_logs
-			0755:${h}/sched_priv/accounting 0755:${h}/server_logs
-			0750:${h}/server_priv 0755:${h}/server_priv/accounting
-			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
-			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
-			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
-	fi
-
-	for a in ${dir_spec}; do
-		d="${a/*:}"
-		m="${a/:*}"
-		if [[ ! -d "${root}${d}" ]]; then
-			install -d -m${m} "${root}${d}"
-		else
-			chmod ${m} "${root}${d}"
-		fi
-		# (#149226) If we're running in src_*, then keepdir
-		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d}
-		fi
-	done
-}
-
-src_install() {
-	# Make directories first
-	pbs_createspool "${D}"
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-		if use drmaa; then
-			dohtml -r src/drmaa/doc/html/* || die
-			dodoc src/drmaa/drmaa.pdf || die
-		fi
-	fi
-
-	# The build script isn't alternative install location friendly,
-	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
-	for file in `find "${D}" -iname tclIndex`; do
-		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" || die
-		mv "${file}.new" "${file}" || die
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d torque
-	newenvd "${FILESDIR}"/torque-env.d 25torque
-
-	[ -d "${D}"/usr/share/doc/torque-drmaa ] && \
-		rm -rf "${D}"/usr/share/doc/torque-drmaa
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-
-	# Fix up the env.d file to use our set server home.
-	sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" \
-		"${D}"/etc/env.d/25torque || die
-}
-
-pkg_postinst() {
-	pbs_createspool "${ROOT}"
-	elog "    If this is the first time torque has been installed, then you are not"
-	elog "ready to start the server.  Please refer to the documentation located at:"
-	elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# root will be setup as the primary operator/manager, the local machine
-# will be added as a node and we'll create a simple queue, batch.
-pkg_config() {
-	local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	einfo "Using ${h} as the pbs homedir"
-	einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
-
-	# Check for previous configuration and bail if found.
-	if [ -e "${h}/server_priv/acl_svr/operators" ] \
-		|| [ -e "${h}/server_priv/nodes" ] \
-		|| [ -e "${h}/mom_priv/config" ]; then
-		ewarn "Previous Torque configuration detected.  Press any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -d "${h}" -t create; then
-			eerror "Failed to start pbs_server"
-			rc=1
-		else
-			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME}
-			${qmgr} "create queue batch" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME}
-			${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME}
-			${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME}
-			${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME}
-
-			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
-
-			# Add the local machine as a node.
-			echo "$(hostname -f) np=1" > "${h}/server_priv/nodes"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.4.16.ebuild b/sys-cluster/torque/torque-2.4.16.ebuild
deleted file mode 100644
index 15435b5fb5d1..000000000000
--- a/sys-cluster/torque/torque-2.4.16.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16.ebuild,v 1.14 2013/12/23 18:01:35 jsbronder Exp $
-
-EAPI=2
-WANT_AUTOMAKE="1.12"
-inherit flag-o-matic eutils linux-info autotools
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="tk +crypt drmaa server +syslog doc cpusets kernel_linux"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	doc? ( drmaa? (
-		|| ( <app-doc/doxygen-1.7.6.1[latex,-nodot]	>=app-doc/doxygen-1.7.6.1[latex,dot] )
-	) )
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	# Find a Torque server to use.  Check environment, then
-	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
-		else
-			PBS_SERVER_NAME=$(hostname -f)
-		fi
-	fi
-
-	USE_CPUSETS="--disable-cpuset"
-	if use cpusets; then
-		if ! use kernel_linux; then
-			einfo
-			elog "    Torque currently only has support for cpusets in linux."
-			elog "Assuming you didn't really want this USE flag."
-			einfo
-		else
-			linux-info_pkg_setup
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
-				einfo
-				elog "    Torque support for cpusets will require that you recompile"
-				elog "your kernel with CONFIG_CPUSETS enabled."
-				einfo
-			fi
-			USE_CPUSETS="--enable-cpuset"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-
-	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
-	epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch
-	epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch
-
-	sed -i \
-		-e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \
-		-e 's,\(GENERATE_MAN *=\).*,\1 NO,' \
-		src/drmaa/Doxyfile.in || die
-	sed -i \
-		-e '/INSTALL_DATA/d' \
-		src/drmaa/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	if use drmaa && use doc; then
-		myconf="${myconf} --enable-apidocs"
-	else
-		myconf="${myconf} --disable-apidocs"
-	fi
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf}
-}
-
-# WARNING
-# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
-# just fall over with the error message, but in some spots it will just ignore
-# you and fail strangely. Likewise it also barfs on our .keep files!
-pbs_createspool() {
-	local root="$1"
-	local s="$(dirname "${PBS_SERVER_HOME}")"
-	local h="${PBS_SERVER_HOME}"
-	local sp="${h}/server_priv"
-	einfo "Building spool directory under ${D}${h}"
-	local a d m
-	local dir_spec="
-			0755:${h}/aux 0700:${h}/checkpoint
-			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
-			1777:${h}/spool 1777:${h}/undelivered"
-
-	if use server; then
-		dir_spec="${dir_spec} 0755:${h}/sched_logs
-			0755:${h}/sched_priv/accounting 0755:${h}/server_logs
-			0750:${h}/server_priv 0755:${h}/server_priv/accounting
-			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
-			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
-			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
-	fi
-
-	for a in ${dir_spec}; do
-		d="${a/*:}"
-		m="${a/:*}"
-		if [[ ! -d "${root}${d}" ]]; then
-			install -d -m${m} "${root}${d}"
-		else
-			chmod ${m} "${root}${d}"
-		fi
-		# (#149226) If we're running in src_*, then keepdir
-		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d}
-		fi
-	done
-}
-
-src_install() {
-	# Make directories first
-	pbs_createspool "${D}"
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-		if use drmaa; then
-			dohtml -r src/drmaa/doc/html/* || die
-			dodoc src/drmaa/drmaa.pdf || die
-		fi
-	fi
-
-	# The build script isn't alternative install location friendly,
-	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
-	for file in `find "${D}" -iname tclIndex`; do
-		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" || die
-		mv "${file}.new" "${file}" || die
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d torque
-	newenvd "${FILESDIR}"/torque-env.d 25torque
-
-	[ -d "${D}"/usr/share/doc/torque-drmaa ] && \
-		rm -rf "${D}"/usr/share/doc/torque-drmaa
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-
-	# Fix up the env.d file to use our set server home.
-	sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" \
-		"${D}"/etc/env.d/25torque || die
-}
-
-pkg_postinst() {
-	pbs_createspool "${ROOT}"
-	elog "    If this is the first time torque has been installed, then you are not"
-	elog "ready to start the server.  Please refer to the documentation located at:"
-	elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# root will be setup as the primary operator/manager, the local machine
-# will be added as a node and we'll create a simple queue, batch.
-pkg_config() {
-	local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	einfo "Using ${h} as the pbs homedir"
-	einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
-
-	# Check for previous configuration and bail if found.
-	if [ -e "${h}/server_priv/acl_svr/operators" ] \
-		|| [ -e "${h}/server_priv/nodes" ] \
-		|| [ -e "${h}/mom_priv/config" ]; then
-		ewarn "Previous Torque configuration detected.  Press any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -d "${h}" -t create; then
-			eerror "Failed to start pbs_server"
-			rc=1
-		else
-			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME}
-			${qmgr} "create queue batch" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME}
-			${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME}
-			${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME}
-			${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME}
-			${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME}
-
-			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
-
-			# Add the local machine as a node.
-			echo "$(hostname -f) np=1" > "${h}/server_priv/nodes"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.5.12-r1.ebuild b/sys-cluster/torque/torque-2.5.12-r1.ebuild
index 2ecc625cf52a..a12e3978cec2 100644
--- a/sys-cluster/torque/torque-2.5.12-r1.ebuild
+++ b/sys-cluster/torque/torque-2.5.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.12-r1.ebuild,v 1.8 2014/01/12 13:14:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.12-r1.ebuild,v 1.9 2014/01/19 13:46:43 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz"
 LICENSE="torque-2.5"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml"
 
 # ed is used by makedepend-sh
diff --git a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
index 045f2b5db377..d98d772a3d1b 100644
--- a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.8 2014/01/12 13:14:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.9 2014/01/19 13:46:43 ago Exp $
 
 EAPI=4
 inherit flag-o-matic eutils linux-info
@@ -13,7 +13,7 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1058 -> ${P}.tar.gz"
 LICENSE="torque-2.5"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
 
 DEPEND_COMMON="sys-libs/ncurses
diff --git a/sys-devel/boost-m4/boost-m4-0.4.ebuild b/sys-devel/boost-m4/boost-m4-0.4.ebuild
index b6c97dc7ed3b..24900ded5aa8 100644
--- a/sys-devel/boost-m4/boost-m4-0.4.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/boost-m4/boost-m4-0.4.ebuild,v 1.10 2014/01/18 20:17:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/boost-m4/boost-m4-0.4.ebuild,v 1.11 2014/01/19 10:31:18 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # boost.m4 has a buildsystem, but the distributer didn't use make dist
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3.ebuild
index 93ed36073465..068539af1950 100644
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.3.3.ebuild,v 1.8 2014/01/18 20:15:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.3.3.ebuild,v 1.9 2014/01/19 10:28:17 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 530e50f4d15f..1e4e2a70082c 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -2,6 +2,7 @@ DIST bios.bin-1.7.1.gz 69911 SHA256 faf2385918ca5b7866b23a30a566334a2d9b70f9c0bf
 DIST bios.bin-1.7.2.1.gz 71961 SHA256 b76824976a43a4379dbdd676b153e762b4e9f0097441a31d70e18c9acc1cae06 SHA512 1e66fec890842b48d11bcb81b63a0b04e3ffca2e1285c356430944819407eb08dc85c50cddab1459a8f94ec1d4492f15207f98ee30263417c47bfd31b8f2a7f1 WHIRLPOOL fc278ccb3763342ab2fc5e1e8fdf05650cc87f23f7620e148ee93918913c2e217b8246e33c1940bf812bbf262180722acbc1ad415c681f3e15409f92b637e510
 DIST bios.bin-1.7.2.2.gz 71896 SHA256 c285c3f6c6819ded8e536d2719e28d1840f50730bc4ef790125cc905c91b0416 SHA512 f14a66733a8806d3d12dc3e58dd0969172f1aef9c3826f2b6e87b805cb789cbea7d1e766e8b0e0f1d729e30def575f0ed6515a702ef709e932e78f7e87279db9 WHIRLPOOL 1e9748c768bbc9886e60cb3d6ad091e0193b3e2f9e44867d30bc2270126e8087f04911ab7c9788d3107c067d9ad4929b9a7e9f5fc18e4baa53416a21fbd184d0
 DIST bios.bin-1.7.2.gz 71796 SHA256 e0b0b4b08745a9ef89ebdbea5e252ce2c6a5f7659085a4c429ec1597282c5c73 SHA512 ea845bdd0eb51891c343215fc8449284a29b440689673a067fa7ca4cb5f21dde662cc948becc27a1ef44043a9acb0a2c5f62077f8c5898744ee11ee2377f1d6e WHIRLPOOL 89aa58d18b9dfc77d697ca8259d37939b68d1099ea189dccd0316bed1dd589b2162477708307dfa52e66f675d4c77cb8fcb1ddc367ab8d37ad4d8d375629bc2b
+DIST bios.bin-1.7.3.2.gz 72910 SHA256 a0d1fb258982d4198f070f5727b95835fb2552c836df129df1c253237d9a9f5a SHA512 95eb695ddbfcba7d18c9dffb6c1591f7866df531c75baad0e04f93af576be9aa4860812c5b43296e2f0ca056311e7d7c2c4c2b6ac7f0a345de2ae9021be52c62 WHIRLPOOL af9f1672399f0f663d620b233cb7bf35069934f5d3878d31f664d565755b291bb96c058a9ce455c653b32a87daba8c3f8f0cda8d6c7f4388870846009af0c293
 DIST bios.bin-1.7.3.gz 73205 SHA256 e6862230581ff6e0838f2a708a5aaa6c34000bce025138ca449a0931ebc0604f SHA512 ea9d1d105fda72d5e277dbde3270c9b98d8d0b73333c1fc721882032a22aea7e1c5b59086a316da51e3e7cd15cd7f2f16b84dcd5d5821e68c1ce234c7e626900 WHIRLPOOL 53cec110016191dff4b44eef587b608f34bc63532d27b78adf224f379e8a822b319d3523004f56b63faf1396b8e9aedcf1cce2532325c6d663ed782a26f875dc
 DIST seabios-1.6.3.tar.gz 438403 SHA256 7bca2e6a0972f16dd238d1ead2f4d12d38dc56e1801237c1205f902d5ea4c799 SHA512 c54991c4250339d04f00600f7b27528d7e31e10032c093409ebb9b0740edf7f179f9b7620f7e77413db51ee27381c40645bddf2550ae450805599cbe8ecbb335 WHIRLPOOL a0d99ceb4b024ed88ae91a2743ec65a0019e2641ac3430592b1204895b24a27e8ae8fe4d9c48ebd13c02eea2b110b8a5bd693a5f7fb603588329a1fa928e89bb
 DIST seabios-1.7.0-bins.tar.xz 59756 SHA256 e444725b5e64e96cfd086560250d6931b085d2c5be014b4fb3227a4e317766d4 SHA512 b47ec7847d8ea8b80ce1658bdca3644570f3c640d380bdd2ac531de652ece83c052f35407b34f96274ff490c0b88ee194c388377c22364f8d7da3813bbc2bf44 WHIRLPOOL d91b8e1c179b0ff294974e954a5a5f6ce7d7470d00754ac6cc1492413df526eb23ff7dd715ef38ed32970f76afe656d0edec8fe90a3434c498105046322663c6
@@ -10,4 +11,5 @@ DIST seabios-1.7.1.tar.gz 455617 SHA256 40db5ec149dabd94fdf46809fc2c1d4a2cc32af5
 DIST seabios-1.7.2.1.tar.gz 458187 SHA256 0d9d5012e753eb2e32718aec3982f7305bd36f4eaf1d0261a49d0b118aa6c8dc SHA512 403454c17f7f61fb45e4749ce62247371c4547510b6f2f9ff5aa97836963d43401d1528139674b68a4dbb92ee275ed47ace2e2efb3e6db92be414d2f30db5bc3 WHIRLPOOL 25cc00c4ecef56cd2cad89c4eea53ca3adf1e2b91aad82edff16d89b92d21b5c0c7e09d241e1ea03209ec6317ad0f4a2760a62631e4ce7802785292468e48509
 DIST seabios-1.7.2.2.tar.gz 448904 SHA256 5ef40e80c8e4ae825922766e82f28232958056f82912a72916ca5dae2147deaa SHA512 2fbe56d04af92b7e7166d2c4b0af0395750c57449735302ee4ef3794a5789a1d1922f9fce53970d3f1923f8ca82daa1d3e4041caaae884c9366c41e11e316e17 WHIRLPOOL 1ffcdc294f7827f669db34e120ccbf6da183359360010288556157d9287b2f55097c90750c3a3f252560363f2b938e8ce95bfb17300e1bc6549a2ae3216a041e
 DIST seabios-1.7.2.tar.gz 467079 SHA256 59d853550925840b0b3f556ec65037d145e113796e9ba7f23578283613f0f2bd SHA512 5321839dda165d488ab315a8e50ee76ed6442e3a18d28783e4512206b771413cd8ac6cfde066edbd7045d8f68747ed21fd3b6f04e3c82244e8c4a1d0762c03b7 WHIRLPOOL ae938d4e935650e53b774c8a4a14dafd07c19d3ad5dcd72281229e934f7c7ee9c4a97d4ad21c8de1cb78a65ca0ebce1859f80834aa312d76ad82332dbb241183
+DIST seabios-1.7.3.2.tar.gz 463900 SHA256 22ed5ba16e3acdf02abc5a7cafafe34f41a02039ef5d0051f5ee4cc183f23255 SHA512 891aa2dcf94d2a84bd1a0b66c724880ec895fe6c79bd9aea06d2125e1bd1442aa47b84fc03e1456900a29dfad9bb90c26123569d18a523572be330efc6504984 WHIRLPOOL 419f20f2854e79c65bbcdd34a3632dfc99248a153ce4fe0cd09ef6bec1bfc7a21a2ae28a6fa87cb9bda4eaebc24c09cf0f48bcf60db3b5c7a050edb699084e16
 DIST seabios-1.7.3.tar.gz 484112 SHA256 2762c5056da9cad463086e5588f9194425ac4d664b9b5f3d00e63950c3103dce SHA512 372ac1ff81b51a732367e266f891de9493f767bd53c95a37bdbb7cbfae4c7a7dee757fbf756df214f5c61409bfeb73607d3f91e180736b9a36a30ec3e132a99e WHIRLPOOL 0bcf2341a9c1812bceb0845f03d08e0de2fe100976cd1fa82f2b27be21d225bc37b1577f891fa8a9c609d199cda70a958a389be69a4755b322f62ed6fbb6d5a3
diff --git a/sys-firmware/seabios/seabios-1.7.3.2.ebuild b/sys-firmware/seabios/seabios-1.7.3.2.ebuild
new file mode 100644
index 000000000000..39779e91188a
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.7.3.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.3.2.ebuild,v 1.1 2014/01/19 23:01:55 cardoe Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils toolchain-funcs python-any-r1
+
+#BACKPORTS=1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-2
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
+	http://dev.gentoo.org/~cardoe/distfiles/${P}.tar.gz
+	http://dev.gentoo.org/~cardoe/distfiles/bios.bin-${PV}.gz
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="http://www.seabios.org"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary"
+
+REQUIRED_USE="ppc? ( binary )
+	ppc64? ( binary )"
+
+DEPEND="!binary? ( >=sys-power/iasl-20060912 )
+	${PYTHON_DEPS}"
+RDEPEND=""
+
+pkg_pretend() {
+	if ! use binary; then
+		ewarn "You have decided to compile your own SeaBIOS. This is not"
+		ewarn "supported by upstream unless you use their recommended"
+		ewarn "toolchain (which you are not)."
+		elog
+		ewarn "If you are intending to use this build with QEMU, realize"
+		ewarn "you will not receive any support if you have compiled your"
+		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+		ewarn "in SeaBIOS."
+	fi
+
+	local myld=$(tc-getLD)
+
+	${myld} -v | grep -q "GNU gold" && \
+	ewarn "gold linker unable to handle 16-bit code using ld.bfd.  bug #438058"
+}
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ -z "${EGIT_COMMIT}" ]]; then
+		sed -e "s/VERSION=.*/VERSION=${PV}/" \
+			-i "${S}/Makefile"
+	else
+		sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
+			-i "${S}/Makefile"
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	if ! use binary ; then
+		LANG=C emake \
+			CC=$(tc-getCC) \
+			LD="$(tc-getLD).bfd" \
+			AR=$(tc-getAR) \
+			OBJCOPY=$(tc-getOBJCOPY) \
+			RANLIB=$(tc-getRANLIB) \
+			OBJDUMP=$(tc-getPROG OBJDUMP objdump) \
+			HOST_CC=$(tc-getBUILD_CC) \
+			out/bios.bin
+	fi
+}
+
+src_install() {
+	insinto /usr/share/seabios
+	if ! use binary ; then
+		doins out/bios.bin
+	else
+		newins ../bios.bin-${PV} bios.bin
+	fi
+}
diff --git a/sys-firmware/tt-s2-6400-firmware/Manifest b/sys-firmware/tt-s2-6400-firmware/Manifest
index e42f5f744033..6e7ad668ada6 100644
--- a/sys-firmware/tt-s2-6400-firmware/Manifest
+++ b/sys-firmware/tt-s2-6400-firmware/Manifest
@@ -1,3 +1,4 @@
 DIST dvb-ttpremium-fpga-01_v1_09.zip 86058 SHA256 bd6b10a56c85439d8d857112bc6b8771557b134e1efb0972c1ea59d7b79a4494 SHA512 2cf783990595f6fc46ad7129829ed2339186292621e0f13d7942313e49808ce5fb43bf4e0968ad317d6bd54343c39dfcd136268a50248bfb8f6c1c54ff9c5a12 WHIRLPOOL cb529f7808b3e203ff12ef300e447dd856375dc7643a7e3e16f96090473ac4deb4133d6d65dfc0242230c2934df0b8b52497cd74d0a9c535566a2c9985ed912c
 DIST dvb-ttpremium-loader-01_v1_03.zip 9841 SHA256 99969d4740ca26332439590e6b6e86711c89be69cf94c3732267b8278c0da763 SHA512 d0fddfeadbf1f5bc06538033ea4b69ecc6a34e1b3a8239df93c347f7882ac6b7ee8b44eaef3eaff15c81bb084e3f985f8504d68edb83479e149d904fb97e2ce3 WHIRLPOOL 2632a19a542e3feb2d6b5446873147af49ccdccf7a202b7516aa7f07aab6fae68b2c6dea3a1da4a9dbede86b5aa0e865e1dc91db28322807aade727b8edd6214
 DIST dvb-ttpremium-st7109-01_v0_4_0.zip 2079060 SHA256 89ea7960f472b8381269d4b5c7575b6189283405c1e38ffaf62dcdfd005de499 SHA512 1f0788e1a5cc152eb7525e54e4c2eca942b2e62262d05c4c771ede9e159ff253c0ce958c18d6fc856c15ed07ddf6d0b7e85dea6e6fd4cac6cf9ce4128a0b54e4 WHIRLPOOL 1f0b8bc328b9aaef8b15c21d66788ae9c760fb860e5fab343416c044ed432e84872d264f240296842f481f9993061644b6b73b57977033e01a455c05602f5096
+DIST dvb-ttpremium-st7109-01_v0_4_1.zip 2069012 SHA256 cb2292e660b3ec6d898fe337d266492a29dcba3adf1a1b5a5fe5e839e8f0db25 SHA512 461ce62bc7103f04d7782ee053b43c35839b3202d140c962f5412747231f9932425f4c35a76ad205efc55719b4433f02838d3d6927d3ec35993e3763fa4adb80 WHIRLPOOL 987bed0455de0fbe9cef039fd4ab46e43bd47eddff703aef0718c31086826455a5ce3e4283d9c4853f0659e8fe76cb20e8ee400afda360935a1162da014fac20
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1.ebuild
new file mode 100644
index 000000000000..0660688b7294
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.4.1.ebuild,v 1.1 2014/01/19 19:58:30 hd_brummy Exp $
+
+EAPI=5
+
+RESTRICT="mirror bindist"
+
+DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
+HOMEPAGE="http://www.aregel.de/"
+SRC_URI="http://www.aregel.de/file_download/24/dvb-ttpremium-st7109-01_v0_4_1.zip
+		http://www.aregel.de/file_download/14/dvb-ttpremium-fpga-01_v1_09.zip
+		http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins dvb-ttpremium-fpga-01.fw dvb-ttpremium-loader-01.fw dvb-ttpremium-st7109-01.fw
+}
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 2ee66e4d5458..3bbfcc17c37b 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -4,3 +4,4 @@ DIST aufs3-standalone-3_p20131104.tar.xz 2073160 SHA256 2a55ece940e4f949482879b7
 DIST aufs3-standalone-3_p20131111.tar.xz 1610788 SHA256 5ea5b080fa8b68f4921fc9fc9247e456c3740321445e5d455ac1eb00454a6d7f SHA512 bf3b35a30164a4f5856db7a66c898e7e3491a5dab05252207fc402b9ef9a946be4cd6fe71370c52c1bc5168653c7323f3ce039f062d9da7f01a84a1ef33c7475 WHIRLPOOL 364b732719d24139eb450275ef9819b58dd8e3fa8bbbc0cd4e4ca5cee5d9beb622931233022f70621887c245dde2d4b879067c68ba8910fdfd8c4fc2f43c1037
 DIST aufs3-standalone-3_p20131223.tar.xz 1612628 SHA256 62872509098ccf57056a1045cd75c83cd25b7f517da8222cb4abf174e6f923af SHA512 28f0490f4c87de07e77208003f511c7e8f7af8a59e4660f6229ed459fa5c2db9c56bcb15d9ae8291106b0b565ec6a8296ddb804799f02c0876d314eae229d28e WHIRLPOOL 66e70e6c8f3212b771062ef48be20db28769adcc846ccdee49c12787e77ae31955586509bb88cf98dc16c1e257e3aebe04e462e039c3a768f3911bd08d72701f
 DIST aufs3-standalone-3_p20140114.tar.xz 1995600 SHA256 0010f7ccfcc8c79cd8a708ee56d8619daecf4a692a2226c62f2c6b6855288ab3 SHA512 ff3ea064a2ffdc80f13e3c561ad87f3d396b5636c14dcf42bb584b8f9680e43bd3158829958052954d7de7abf178ee628575c4fb949f0b67d89a6426386720a9 WHIRLPOOL 09bbb6921d2f22bd314d5737809bfb78cc87a13cc76888faa4b6da44f59c16f9202acd1eab1d461a08bdb5d036271dfb1de80fea7ed0b64b655d9513ffdf5209
+DIST aufs3-standalone-3_p20140119.tar.xz 1655840 SHA256 c7c25614455edf72c3eb516cfc3311becedcc24cd0ddbfe442e86938f4943589 SHA512 169ec3129a4e24cbe9293852906d172835942910f5bcbefd35a66669d23a2d0dc5bb59ee432f77ca76ced0b29c84ff814577fa86a1ccc0b27a2d96b2b81963b6 WHIRLPOOL 74ee3fddfd1bb2bd47fae61229bb53d90bd2f602feff0936eec652423aa2cc3b10febd8df10bef073d6f3d45d599516548f43d7b794d26427fbd2a9e26c2e482
diff --git a/sys-fs/aufs3/aufs3-3_p20140119.ebuild b/sys-fs/aufs3/aufs3-3_p20140119.ebuild
new file mode 100644
index 000000000000..dff318554abc
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140119.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140119.ebuild,v 1.1 2014/01/20 07:28:36 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=12
+# highest supported version
+KERN_MAX_VER=13
+# lowest supported version
+KERN_MIN_VER=10
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "10" ]] || [[ "${KV_MINOR}" == "12" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.103.ebuild b/sys-fs/lvm2/lvm2-2.02.103.ebuild
index f0f88b3c0be6..947817e59917 100644
--- a/sys-fs/lvm2/lvm2-2.02.103.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.103.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.103.ebuild,v 1.6 2014/01/14 21:09:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.103.ebuild,v 1.9 2014/01/19 10:56:10 ago Exp $
 
 EAPI=5
 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev
@@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-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="readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin"
 
 DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
diff --git a/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild b/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild
index dcdbe914cfc9..2013ed1e032c 100644
--- a/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild,v 1.7 2014/01/18 20:05:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2013.1.13.ebuild,v 1.8 2014/01/19 10:17:11 ago Exp $
 
 EAPI=5
 inherit eutils linux-info udev
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 3afa0b1d4d17..5c1a4a74431f 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,2 +1,3 @@
 DIST udiskie-0.4.1.tar.gz 10682 SHA256 71b6fa6b9b236d4c8bef57ecb043f05888f2d229b74545e251d1d8b8758340f8 SHA512 ed0b8d7182982ac2cdafdcc86cdef9dff54313f85f4829ad9f0a41e167a4db5411de3cc2f9b230b37713b4b46675ce79733f539173a87f26d1c932534533fd98 WHIRLPOOL 4155a278e71c257f723b2603b7d4aa3bb5810943b8c26534d83fdcd9155616e928f4d6af2fb352484c771759e9035e7fab2a613d1df4ad8a48a2d86107f9421b
 DIST udiskie-0.5.0-1.tar.gz 13293 SHA256 bb0cd6e1029f79124b9b209a9b907ccf88e1aff4b6da6379068a4cc2601a8059 SHA512 ee120e2776f61b276e49495aa1c10663eb558998f6f5ef3b81443198070a0148dff949b9f030c9802645c343a57d42d539c5717bc7f7973705d886c4557b6f07 WHIRLPOOL 4ee879ec1b168a5a0949a752c361b9ff266f45c2257b0d12576a046eb2a5e25e39d3d787e73b88b5ef6d37b02438c01f6117cbd1e6347f5b0e70af431ecfa494
+DIST udiskie-0.6.2.tar.gz 48983 SHA256 94427cc626efc375dfc8f7b8dfc4eb7028e69829f3eb42e7f54d20a4780cbf37 SHA512 5e1aae4b31c9d7d1a438c2153bbdc5bb45a1f28264c80ed11d060e507949c996cc8fa0b85b506d7ee0f867b583529d6c039353ea19490c3c158c7d94c7ad9e26 WHIRLPOOL bd5e8d9871c87173198cb1747fcd707888e32357ef7c8d1bd0afd8a08b876cf6361690a27bc0cff21432b2bca770315d613dc0bb08d79002c67a689bc35b4e94
diff --git a/sys-fs/udiskie/udiskie-0.6.2.ebuild b/sys-fs/udiskie/udiskie-0.6.2.ebuild
new file mode 100644
index 000000000000..b6cc66c9758c
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-0.6.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udiskie/udiskie-0.6.2.ebuild,v 1.3 2014/01/19 12:24:15 ssuominen Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="http://pypi.python.org/pypi/udiskie http://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/dbus-python
+	dev-python/notify-python
+	dev-python/pygobject:2
+	dev-python/pyxdg
+	sys-fs/udisks"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools"
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.3.ebuild b/sys-fs/xfsdump/xfsdump-3.1.3.ebuild
index 2583897cd8b2..7b7448fe09de 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.3.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.1.3.ebuild,v 1.7 2014/01/18 20:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.1.3.ebuild,v 1.8 2014/01/19 10:28:30 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 -sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
 IUSE=""
 
 RDEPEND="sys-fs/e2fsprogs
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 75cd34c8cd79..aefa4a074408 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -2,7 +2,6 @@ DIST aufs-sources-3.10_p20131007.tar.xz 150600 SHA256 7f8866e1f602602d1214d959e6
 DIST aufs-sources-3.10_p20131111.tar.xz 151456 SHA256 a5229c12e9cf62a04bc84458df88d4fdb3c4e30e38c184cd2e236b22efe01e6f SHA512 421ac913b40c66dab4ca01da1c08204d1ed78a93e4dba09795f0a081a1af5c30bd82863fafdd034defb840b7961e49713242549c2bbe4d8bddc4c81663b27ff0 WHIRLPOOL c215c4ca78409efe48dea1cae373b645452d16ee8711a00913b52c4796756e90960e3d4a61c0a2b1ddf693aee3e206401f6bf648f0d5af0404cda710ee3d8339
 DIST aufs-sources-3.10_p20140114.tar.xz 151480 SHA256 2ca86e6b1f0f531086bee0a6cfe34d5a38d7c1eb02829d49d15ee141e869c2df SHA512 54fd27a140d7f588410de202f594cd88589deac8575798ae67630181ec8203ae0f784d0f7c2e921c8fa0a7a62d5562b1b8a21804d653e612c4b27eca7ea88e79 WHIRLPOOL 9505f9c9b5a73f90f00edd7f11dc5dc728bef93a1b3da423153893f456ccec71b237ea5eec2e53f15c2e760b852025ef432a6d299dc77bde7eccfad1368fb6fe
 DIST aufs-sources-3.11_p20131111.tar.xz 152028 SHA256 fe8e9e0257d10138753207b22bdd8ed333da905bb47ac73b6f596c83217c03ec SHA512 dd6c525bbf144c2cb1b4706a78f60f02fdf97a7550a6a2ad6dea4b5260fede9dc55208c596d243d07b435e0ee9a341e70be983d302a640c6dcc0a4a485ce8d75 WHIRLPOOL 2e1425b6fdc4aecb581c7a2143af51ec360931c526bbf9df5c3c552af5965da38e3b13c84bbee5b1c79e792fc571328a746353007b363800a35158d84e0f054b
-DIST aufs-sources-3.12_p20131111.tar.xz 152124 SHA256 010b330230b3ce63a4b60b5f049fd3a225518891fce4ac2e4fbd73a02b15a271 SHA512 b34f1d9489748e82d6023ce4b89b87ed7fb4e3b62b99895424f00c241efdc24ff8ccc398ad0558933960fb0c68a61d2bd648d867e95a1ef9617119976422b2e1 WHIRLPOOL db938d8f50d8a5ecd60ddd26422ad851c0d22593b06d113057dec13df30bdb737d00bee888b86cf3c90673301355b6323d7368c7a195ac173be46b2f3411acf7
 DIST aufs-sources-3.12_p20140114.tar.xz 152144 SHA256 357f0520ec2ea64572e4f323811f4457694aeec9bba3204bedc45f95e7f77e0c SHA512 c55dfa9c22eca7f71c467ac0e4745e064de9dda98a6faf8475a105aa0f2c0293e0f8e74bd79c56b1d36a082fcf677314e99597e01cc6cc5928f0239a8591eab6 WHIRLPOOL 349069914ad6a65f5961cd418d6de59a1e29fa80276a111872129a2adac44f7bc4e8697e6eae74c5b3464a479974d0b73e530a89ff6b456b2ed32942c694300a
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.11 119401 SHA256 78bf8169e466a2082c6bedca0431bdbe15a55f4ba96c16a631587f23e0cdef25 SHA512 d6f87cf2d9c0a7f59a52c5a890015e050ba684d34f9e81ff8386ab57247718d0b10b6cd8a68ce3dd25711936b660b7cf512cacf31a3467b9b70a3e3e8433e142 WHIRLPOOL 026a2ff10994be722b08b1638366be8311c685c69214db9449e605477f81b817a8c2ca1e4d8617d61f7f66a6f287c74f68a679bc81ff3364d0245eb3ea84fe36
@@ -13,12 +12,6 @@ DIST deblob-check-3.12 601108 SHA256 e6c07b4220f86007ea31f9ed5d01023253296ddaa07
 DIST genpatches-3.10-24.base.tar.xz 341852 SHA256 7f3ee2b5c2b0ea4cb062d3ef0b69eed41dd855e1b3c34b787e5b0d186872fed8 SHA512 9646c210139e709b901df8402b14b5510c68a069ec1d77b7ccfaaba0c0831075c21ffee89c4388469b14236b8f8965dbb118c60e94814bd71fe861fbf5cbc371 WHIRLPOOL 5a014618a840e6299f7dd7d79b027c09c7f39ed854495ca7c3733e5203db73a61b769da2cf3c62d8dc5846441df63e4648f830a90343bac3e10ae6d695f2cdb4
 DIST genpatches-3.10-24.experimental.tar.xz 45588 SHA256 a10cdac1f5fd22d1d81a2f35bac9927028f7545a681f789c88638765aea4c983 SHA512 302de0d2dbfb2325084f2fad611a2b452b17cf07da88378b97a163c2de2879862b020be861167ce9e165ce11d9bac55a13bb9e9c0b1627f5a50445b2fb423ec8 WHIRLPOOL ba3d4258e886b8007871fa80dfc1308813bde8cf7e4a492df0dc01dc102298fd48b507aa576189f18de98db9fb641c729bac14c8d9126b44fe6c5e8ec7803cf7
 DIST genpatches-3.10-24.extras.tar.xz 17760 SHA256 000d999dbce3be66cdfe54c5c59400d448b39150e53924f6c2238330a953d731 SHA512 bbb7f9bb03273db4e2f627570c44f3851d7aedc232467f89ea3b22828b2cf0e43ec260ca2e4014f1d44d420c82639cdf7e2e85e8cb17d3b8f7d945989cb1a838 WHIRLPOOL 52fccf3ea047b44e8d301b1318564cc6c47a23dd3dd71812c6a041f3f202a70413c2e28579002120e39b6195d20670c7aeb5de61a717658247f42c88eeb586bc
-DIST genpatches-3.10-30.base.tar.xz 448052 SHA256 fb23536f32cf5ad7f4d1adaac6f9dbc56bb1fbb33edc9ed333c9508b6f98db47 SHA512 42d24eec1fb3a4f3313767805097ae0c7f9d3854f93a337b3a0c9789b3343fe9b228ad3b80563f1ca74ac138bbfd7c5fb848ed3281680544e3f0932d52380f2a WHIRLPOOL 23a11d810808aace97fbcdaebcce685168025fd958503d00ac7de68bafb51ded9b60b4710b791e551a82ce54f8f915e1e899bc748fb5d768904e84a8ffa52de9
-DIST genpatches-3.10-30.experimental.tar.xz 45576 SHA256 00524a6e8bab9e6be6233ee194de93ecbd81b93fe5c3595b25002af6271b1176 SHA512 cd98ac5a0232f28b63aea231f78590d33b5a708e7fba3f8e8093997a69ab0b76d6f05d3a4a861ab8870aac71f9e5d9a41ec615cecf5fbafd0570282b7abf26f2 WHIRLPOOL cf160ca6f7c10ba0179e9922b81533750b61dc4d2bbcd23adf0f427df722162148df6e26cfb94e91370536cd3d4ca89bc54528d11bbdc87cfd5cbc5c730ac12a
-DIST genpatches-3.10-30.extras.tar.xz 17764 SHA256 bd473f3468a46c273cebc80e24b86a89871d8ceb2c4e9421e97e5cc9057de50c SHA512 df9a806655f66b3ff62d48aa609cc3350c4fd1c0a2c2926412bb1ce394c0ea693a06ae2900dcc9e479cb1a6d509e7cfe3afe1204948972cc814c332f0bf119e2 WHIRLPOOL ec032cd967277df84d4d9641ff8d35b790b48fb4c06eba7569bd0bb5df0170ab1b4f6dbac339d064a12ae1795546b3958dc92baef8710a00cab0152af9de5ec6
-DIST genpatches-3.10-31.base.tar.xz 483720 SHA256 01e8e54326a47fef9cfbe27b5604c2154effba9bd2ec57b409bda4b070c5723b SHA512 a37fc750776088a3622cae368e6518eb31a308b95edeb088b0a7c3f255a2e008e28cef2e017bfef3c0055b829f20cdbc6f1b491463f509d443eb0129026a46ec WHIRLPOOL 266960ab28e267d3a26ab3f0c254ab0c8f26a6bf5ee847d06a65d694733e4692cf5cafd87095a0b4175a14d33ed5ea6993bf6373eb4ce2649af42999d60a932f
-DIST genpatches-3.10-31.experimental.tar.xz 45580 SHA256 7b7d5df0bda4b912bf4e770431a75c9647ea0eef5438d568ec3b84a6cc0536d6 SHA512 af98396f354eeae1a59fde7691435df8ee2221551577e44d8147af2147b0a4792e6cd42dee94dcbae4fa74ba6071ae5591b0e284b58bc3f78d756a0244e2fb2d WHIRLPOOL c3804a35f451b9e4520f57cf079ffa832174be8b5fc17b464362b6c8e675f63bb99d19911ef35cee558966d08ac73fe1270e34e6f827ba1aba8e58c162a1f6c5
-DIST genpatches-3.10-31.extras.tar.xz 17760 SHA256 c9beea4242a8429553991400ed43bc5d97ccbdd8e80efdff2dd3e414be58e5f3 SHA512 54b0022d535c8a4231229ced239b699d786823154e0573135dc1f269dafd1fc3178fd8d8b236fd608a2b79dff4c41f764128022aa9fd4645bf9855ea66f54b79 WHIRLPOOL 8cbdd9dc85562011ad9578e285c95e458724fffd6b5da728cc92c49f1591d39cf34813d8f1db8647b140959cc1bda48c5bf66e1fad09ba71f27f4c1f9ef66985
 DIST genpatches-3.10-32.base.tar.xz 502220 SHA256 1ef12c9a936613420d57fc9498f53d9799db76029ee1fd768a646253780a3a78 SHA512 72d030a3eb8e0b3defc1201c34ba5e6bfcc298d6c716354fa43e0bcffb3a48e36c72b7f85d3a53938359659aba33dc4e3570650f5c66d0501e5fa5d78c563874 WHIRLPOOL 0e216c381b935f8e3131139c618362482fd9f72d9ebfb656f78057d8bf15e55e3a9b6cdff14ca58a5ec263d8237e823f36bd8116adfc941238fefe08ffcad747
 DIST genpatches-3.10-32.experimental.tar.xz 45580 SHA256 7b7d5df0bda4b912bf4e770431a75c9647ea0eef5438d568ec3b84a6cc0536d6 SHA512 af98396f354eeae1a59fde7691435df8ee2221551577e44d8147af2147b0a4792e6cd42dee94dcbae4fa74ba6071ae5591b0e284b58bc3f78d756a0244e2fb2d WHIRLPOOL c3804a35f451b9e4520f57cf079ffa832174be8b5fc17b464362b6c8e675f63bb99d19911ef35cee558966d08ac73fe1270e34e6f827ba1aba8e58c162a1f6c5
 DIST genpatches-3.10-32.extras.tar.xz 17760 SHA256 c9beea4242a8429553991400ed43bc5d97ccbdd8e80efdff2dd3e414be58e5f3 SHA512 54b0022d535c8a4231229ced239b699d786823154e0573135dc1f269dafd1fc3178fd8d8b236fd608a2b79dff4c41f764128022aa9fd4645bf9855ea66f54b79 WHIRLPOOL 8cbdd9dc85562011ad9578e285c95e458724fffd6b5da728cc92c49f1591d39cf34813d8f1db8647b140959cc1bda48c5bf66e1fad09ba71f27f4c1f9ef66985
@@ -37,15 +30,6 @@ DIST genpatches-3.11-13.extras.tar.xz 18164 SHA256 d54e3c6b4261ddeeb1932b2884599
 DIST genpatches-3.11-14.base.tar.xz 207496 SHA256 c9ea16218b729be7709d411690281a019dfab611471e668e42dce3330906c5ed SHA512 cad7f628a8b4d04bd545270f4cd2900d15ca7525c4d5b6baa5aaf8210b44a1065d34b4855bc805892547775af2009c96521ed176118e5256db2eae14a3af008a WHIRLPOOL fa652a4002906c17bbbcca79e351b189e047c096fb344eea4372c42f7cae94435f662edaf3f1263f978edbae18452864466c69d04bfd28da52d8c735b03b0027
 DIST genpatches-3.11-14.experimental.tar.xz 45276 SHA256 0f2297d5ae40c532ec823ca95de977e55bfd9adef076a91564def0e876a31d0f SHA512 3098f9e6ad8a41389307dafe5674f1680c7169f031c951dcd8acbf02432a632e5de149059893daeb024847bb1bf63f5cd07ae7302c63bdc3934e47e9518c97ef WHIRLPOOL 139068f19f16143be570d7341f892b271e4005aef8dabd7b488ca6322cab252c9d3d21c77f932bc638b3a95a8ce9b8d1baaa898d268400881d9add464f324a46
 DIST genpatches-3.11-14.extras.tar.xz 18164 SHA256 d54e3c6b4261ddeeb1932b2884599162e3351e1474e2e5e263fe4ff1ae8e4d16 SHA512 011a18ef564c719d4d25611fccf2f0842f28b28b27a7a9c934fc4de9aa76e469ee50777300995f85b214b338cea4078e3cddb38fd7298db1c0e46e3fb1d9dc25 WHIRLPOOL f03eac8c7b870b99668ee307e4ed5f50d4dc8497b849687954bb6f18dc336829025b00cb938553c4f3a58b8203304f7fc40c8954a16edb2d537ce5b80d6f0846
-DIST genpatches-3.12-5.base.tar.xz 144696 SHA256 482364f756d8981c2db95e41a33653682232a98b37202abe7e8f6d0442117250 SHA512 8f98361b4744f23659870a0c97b580ba424448b9c4ac91d5b4bf37c3f7ac384d57ee7de5a266fc2b7bb6a5f98f4d136bc0d613f660cd24bd66e9c3f828384e65 WHIRLPOOL 55a95a48da90b8050959cf7bb3fd2405252394444be2aa0f14869ce782636b98e403300a56aca295016c66d4b4f37122db398a68a073d806269464ac0a66aeb5
-DIST genpatches-3.12-5.experimental.tar.xz 46524 SHA256 bf0db63a463b9c6003e47f00eda2eb1474d9a365f0481c151bd5d78086e4cffa SHA512 ea9d03454b635816585e0ddaa678febba540b19d1a435efdef8fa6f6e4b03db1baeee36333ca1a9a0ad25b3a20b1f4976c3a50ff9621f13c80ec17b9372a2a79 WHIRLPOOL fc3ea785a3edc38ebfd25e2eb83484a6ad3a186d9293949ef1e2d55ed01c1a8e710b05c42b2650042bb16d7555b869cffaba62b04db9828ca3ebc4b1ba57bb67
-DIST genpatches-3.12-5.extras.tar.xz 18152 SHA256 976f1955368e5bac0bfefe97fc6fc53a67ad003da86c22a0eef8860fc8439909 SHA512 edb22af4c538cd02fc4d43cfe5d2eff887a2ba636c50428c2794722cf02fea3bf22b251ddb81da7d2a934331b4d0231fdeb68fd15e6556bf93cc5d743fbdc923 WHIRLPOOL 6dc333619fb6e70f760adab02c820c58295d3d55f6d60252183f3b979d5cffe78fab04f671dbdada6e1134decfefa8440b28def7ca1a68fc2e9fca41db2a329c
-DIST genpatches-3.12-6.base.tar.xz 162056 SHA256 7a20ec90f9e2be68b7677504209b39ebc9af936354e0d67e193272e6267d4299 SHA512 f90637a34341f864dfa8a9f417f66b58b4cf01770310921af70a777c723af7a04238f27652ed1495fb9e212bfee3a17a5275b3fb76e973c9ad291bd668f5e718 WHIRLPOOL dcce9c4ad4dac92a1161f24de22654a7356559c6b8a2fc6aad186d685c34fb477d0ebdb1ceb925230fcfd1638b1c4d3c04e3ab5229476648c8a827086bc1ec4f
-DIST genpatches-3.12-6.experimental.tar.xz 46508 SHA256 775c170384bbf4c8d04dd6348b5db059f67efb08f76a5f71a210197ddeddee44 SHA512 b66233f7f3ae59e178e1f527f7cc1c68a68c0584b39eeb49d24c8443c178096ad31c3634c48bfc3fa980fdbe0ab9d4d25ce2f0509618f44389d62800ff530b7c WHIRLPOOL a4cad91c0a7597df0c84809a8cec61465e17fcdcbc84116e490b0f8f28e015d21ad5f5d05e9122cdfaeb7b1768dd4ba617b72d94eda35ced376f21281ec5a2f4
-DIST genpatches-3.12-6.extras.tar.xz 18128 SHA256 51b625d97db6b7e221bb77495095cd4501e2e8a20afa27549dd6fe818badc913 SHA512 852d56205ed82885f64f265b2978ed86c767d4c62527bb8fd376e8a1eb61af9b6c839a5dea1fb91bb0c8a5a1313c50bcadebb71129b38a52b0c5115714e0efa4 WHIRLPOOL 6afe1b3b0b45ad24e590495976ed80cef936e47ae863dbb36519c76799d7e7645d09801f4818ac96f737fa6bc3bd6424e5fe849b41438b3afb3e15a98c5c34a3
-DIST genpatches-3.12-7.base.tar.xz 195620 SHA256 00d27da9e21cee279cf4ed4d8b80adad291b4ed15ca9ac337b3c4bfbd9ee3a51 SHA512 7fe1651f0d3188ddc7987a5a133c8e612f1e9b319251d9ca3ae3a7dfd23a57bdc1117d1b4793072a3859cb1f631b6dac3902315326143f579260ff9c5639bd5e WHIRLPOOL 60f85a0d37ba59a4d9cb9355b9f176b650dea4b2f4fce4c285edec9bce34cd54f89e196393249523bf95653d69ab08444db4a3ed394dccd08fb800d5974fd6b7
-DIST genpatches-3.12-7.experimental.tar.xz 46508 SHA256 775c170384bbf4c8d04dd6348b5db059f67efb08f76a5f71a210197ddeddee44 SHA512 b66233f7f3ae59e178e1f527f7cc1c68a68c0584b39eeb49d24c8443c178096ad31c3634c48bfc3fa980fdbe0ab9d4d25ce2f0509618f44389d62800ff530b7c WHIRLPOOL a4cad91c0a7597df0c84809a8cec61465e17fcdcbc84116e490b0f8f28e015d21ad5f5d05e9122cdfaeb7b1768dd4ba617b72d94eda35ced376f21281ec5a2f4
-DIST genpatches-3.12-7.extras.tar.xz 18128 SHA256 51b625d97db6b7e221bb77495095cd4501e2e8a20afa27549dd6fe818badc913 SHA512 852d56205ed82885f64f265b2978ed86c767d4c62527bb8fd376e8a1eb61af9b6c839a5dea1fb91bb0c8a5a1313c50bcadebb71129b38a52b0c5115714e0efa4 WHIRLPOOL 6afe1b3b0b45ad24e590495976ed80cef936e47ae863dbb36519c76799d7e7645d09801f4818ac96f737fa6bc3bd6424e5fe849b41438b3afb3e15a98c5c34a3
 DIST genpatches-3.12-8.base.tar.xz 235944 SHA256 688ca01177f786e8a1f2d904ce52b99e8b87bbc0964e4b5b41b311032a9fd4d6 SHA512 6389485a4c5bc537b03e89266e9fb7d8cb5f7ab305d7c91f672cfb180dba74562a6e6f2ce99065a6d90eaa5caa79cd131f168d24f806e5ab3687e7de846dbe56 WHIRLPOOL baf4f0b15fec1f23e67c44b34c7c77ef377945f230f88e03d534d33090239519cacef40cff987cbb03323ea534d835423bc9c5abefe4cd7b1fb851cc1c2cad71
 DIST genpatches-3.12-8.experimental.tar.xz 46532 SHA256 a1491fddfab9dc468e6f19e0aa4fad8c28749bb3e86fc35caec5562dff809ee1 SHA512 15cc64ff7e72e39aaa4d22f0b3d97cadb56f7e7e2400ec9c9ddca1d493e02ba81ce6c38398a6e7b354ddfb8a81c59df1bd3c5a6f6b91abd0ade1c2df2bc00090 WHIRLPOOL 286e564a1c32f479c6482d476cdd088bbae42a56ddd978fa66ae67081801c81316e7f2850ad727691ff90c55abe611e249faa961c6dbf928da180c90ffcc12e5
 DIST genpatches-3.12-8.extras.tar.xz 18148 SHA256 2f865fc797b96ca30ac437718bb8b9feef442d3ed99b61224d5dc496b5ac7f2c SHA512 a0851b94669e097b3493baa6625b052dd6ce6bf3b318ba62474b8d230526bbacd3751a99ea108b641dcab490129aa370327e8c971996db3afb088e3053f761ff WHIRLPOOL edea43599166eedc00a4254fd32930e21f082af64e067cfb2b8731016062ce132641ae3abbd30a321bddf66db6eabe026d979b98f1802c12c0ffc26f8b149eff
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.22.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.22.ebuild
deleted file mode 100644
index 0f08723ffabb..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.22.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.22.ebuild,v 1.1 2013/12/08 11:20:41 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="30"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.10_p20131111
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.24.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.24.ebuild
deleted file mode 100644
index dd38d188c2d0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.24.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.24.ebuild,v 1.1 2013/12/16 15:47:44 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="31"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.10_p20131111
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.4.ebuild
deleted file mode 100644
index ec5995f32394..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.4.ebuild,v 1.1 2013/12/08 19:01:51 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.12_p20131111
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.5.ebuild
deleted file mode 100644
index b2165e4d9ea0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.5.ebuild,v 1.1 2013/12/16 15:47:44 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.12_p20131111
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.6.ebuild
deleted file mode 100644
index a49b79fa33f2..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.6.ebuild,v 1.1 2013/12/27 16:38:58 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="7"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_VERSION=3.12_p20131111
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND=">=sys-fs/aufs-util-3.9"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util && \
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index dda61b7e5339..c25d6016f0f6 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,7 +1,2 @@
-DIST dracut-026.tar.bz2 249079 SHA256 1b3b25350dbf71c9d92dd6fd0cd128db13453e200e89b649ec3753e6f92438f7 SHA512 6484645df118ce2337920f6da574e04ede8131c4f5ae2986008cba527b591fde2274c3cbf8cacf20e3dcd765adab7f6afaffd2e1cdbd5a5a021193f328a844cf WHIRLPOOL 87934eb5d7d118be61a609aebbec94a4e70df58a883f0c856f90e8e8b011c695a23d5b00a120bcd74e0644f06f54038712b1ca620d8182c1fcffb4f3f5ea8ec2
-DIST dracut-027.tar.bz2 253049 SHA256 9a8f1ad2e133b4072ff433410be5b14a01cec4f75ab72ef0296e5f49a15fad13 SHA512 1e44b1ad09bc631cc554be4917c5f56514d6f5f4f9658401a7c7e9dc20ef79029246106682146785cb63beef39061aaa944fb24acd106086f02ba1356c61e938 WHIRLPOOL ebd0e0f1c4ba6e95a320e01f98ed7e31d7f399b05c7133fff8a686750f39f29c803b02764995775fa3f2c383205bc09b35a905116d366298bd6587d8d1cac572
-DIST dracut-029.tar.bz2 259163 SHA256 f32f9deb42a03878d96a06a1b365ea26cc46345fc55631502ee2f68a4c6271b9 SHA512 0b68ab67e1b9cf98b7f4fdc29e73e68495077cd7c127c6d732e5f9c26a1312c48323ce3e9595e4d08b0d6766438cda425d04bded1286b70725b53c781e572c96 WHIRLPOOL 877f6dea157e7d6435ac983121fc8e69823960a173420a3e4eb448fe95de7f0bd69d48c17090fcf99d8bafc2bf35e30fd3723fddc481512d579f93e44c06c3a8
-DIST dracut-030.tar.bz2 260378 SHA256 3c05121cc3aa2281047dd4103762166307ff9b0c6ab798c121196be9725ea05c SHA512 c872b90c695f74ff7d5f597d2dc5f934c0365c6e907f00ffff770c0c4fad325002a9397e93727254d35b7a9bc73f628c59414bf9307e8742c5a6af476751216e WHIRLPOOL 184a11d17fea8bf781c32cafa92789d45503042e2f9916d8ebb024d036a6b69de8e8fc07dd6494a07c77de832d7eb38ab6d6bbeffc7d3dc8e1c3ef138270e7b6
-DIST dracut-031.tar.bz2 260601 SHA256 a62fd3d22600adc0f370d2eff474f9aec51bc3dfb2be619647f258a9805bbb77 SHA512 ddde1279cff61b6fd8567f5e21b5f8d95e935e42520a342960432749c6a085637a5e049e6fd121d491727aea3b35af59e86c8b80e55180f3b5e496aff2b6eb23 WHIRLPOOL 46c9d2a3717fd8c36aac269a213a433f6534b2a547e0b23a31ffca9a4101c69c7253358fccb8a55a0ab9b19d4c4218eb902c49a6cc0fc08c48e3cd70c40eebc2
-DIST dracut-033.tar.bz2 273118 SHA256 2ba778b0af2fbd3a3b11d19d5eafb7671bdf2431d06cebe73bc6b20126d378e3 SHA512 c8bb1335b58c37800586a4037e7fe8d2933158b7123b4c7a0e06bf841fdcbfb0d5e3ba26050d72b056164bbd2315541cc92ae6ba9380a57cda243f4e73adeb8c WHIRLPOOL af62ca9913910cdd84c335417d237ed12da38a96244be2d85e210bec8e75bf3c02eb052d0deeece3f669a7f7f8c6720aa88352683f7945dcb7e736bb4c0739dd
+DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362cc93a78c5be28ffd7c794a331f992498e451d69c1830f054fa SHA512 e5e41b8696716c5284ea981ae85dbe688c5c31330e400c79f4ba46890939dffdd7744e4a85d27d074987a8db65114332171af0a5471338e3e4bed19d54edc6fd WHIRLPOOL c5d29ef2f20aa752e57180be35a2014c214a25e4e49d3f623d05cd6ef1debd2cec38d24453ecb0c004cdbb52239f0d541ddc9df065ab84fb7d62c30594704347
 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13
diff --git a/sys-kernel/dracut/dracut-026-r2.ebuild b/sys-kernel/dracut/dracut-026-r2.ebuild
deleted file mode 100644
index ffdbfb2ac314..000000000000
--- a/sys-kernel/dracut/dracut-026-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r2.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-198-r5 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch"
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0004-lsinitrd.sh-fix-for-default-initrd-not.patch"
-	epatch "${FILESDIR}/${PV}-0005-lsinitrd.sh-removed-trailing.patch"
-	epatch "${FILESDIR}/${PV}-0006-make-host_fs_types-a-hashmap.patch"
-	chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$($(tc-getPKG_CONFIG) systemd \
-			--variable=systemdutildir)"
-		local systemdsystemunitdir="$($(tc-getPKG_CONFIG) systemd \
-			--variable=systemdsystemunitdir)"
-		[[ ${systemdutildir} ]] || die "Couldn't detect systemdutildir"
-		[[ ${systemdsystemunitdir} ]] \
-			|| die "Couldn't detect systemdsystemunitdir"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	econf --libdir="${MY_LIBDIR}"
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local libdir="${DRACUT_LIBDIR}"
-
-	local dracutlibdir="${MY_LIBDIR#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-027-r3.ebuild b/sys-kernel/dracut/dracut-027-r3.ebuild
deleted file mode 100644
index 7125c74cdf81..000000000000
--- a/sys-kernel/dracut/dracut-027-r3.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch"
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Do-not-call-plymouth-with-full-path.patch"
-	epatch "${FILESDIR}/${PV}-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="${MY_LIBDIR#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-029.ebuild b/sys-kernel/dracut/dracut-029.ebuild
deleted file mode 100644
index 576bd1bdd8b9..000000000000
--- a/sys-kernel/dracut/dracut-029.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="${MY_LIBDIR#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-030.ebuild b/sys-kernel/dracut/dracut-030.ebuild
deleted file mode 100644
index 78786ecb58e0..000000000000
--- a/sys-kernel/dracut/dracut-030.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-030.ebuild,v 1.3 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="${MY_LIBDIR#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-
-	# dash module is no longer supported
-	rm_module 00dash
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-031-r1.ebuild b/sys-kernel/dracut/dracut-031-r1.ebuild
deleted file mode 100644
index a34364f85f8c..000000000000
--- a/sys-kernel/dracut/dracut-031-r1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031-r1.ebuild,v 1.3 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Revert-base-setup-correct-system-time-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="${MY_LIBDIR#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-
-	# dash module is no longer supported
-	rm_module 00dash
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-033-r3.ebuild b/sys-kernel/dracut/dracut-033-r3.ebuild
deleted file mode 100644
index c7ece3c25b78..000000000000
--- a/sys-kernel/dracut/dracut-033-r3.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-033-r3.ebuild,v 1.2 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_dash
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch"
-	epatch "${FILESDIR}/${PV}-0004-Install-dracut-install-into-libexec-di.patch"
-	epatch "${FILESDIR}/${PV}-0005-dracut.sh-harden-host_modalias-reading.patch"
-	epatch "${FILESDIR}/${PV}-0006-ifup-do-not-dhcp-on-network-interface-.patch"
-	epatch "${FILESDIR}/${PV}-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch"
-	epatch "${FILESDIR}/${PV}-0008-mdraid-module-setup.sh-install-configs.patch"
-	epatch "${FILESDIR}/${PV}-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch"
-
-	local libdirs ldir
-
-	for ldir in $(get_all_libdirs); do
-		libdirs+=" /$ldir /usr/$ldir"
-	done
-
-	libdirs="${libdirs# }"
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir=${MY_LIBDIR}"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install
-}
-
-src_install() {
-	default
-
-	local my_libdir="${MY_LIBDIR}"
-	local dracutlibdir="${my_libdir#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-034-r3.ebuild b/sys-kernel/dracut/dracut-034-r3.ebuild
deleted file mode 100644
index 4af25919f665..000000000000
--- a/sys-kernel/dracut/dracut-034-r3.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-034-r3.ebuild,v 1.2 2013/12/28 17:41:17 aidecoe Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_dash
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils )
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch"
-	epatch "${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch"
-	epatch "${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch"
-	epatch "${FILESDIR}/${PV}-0006-resume-fix-swap-detection-in-hostonly.patch"
-	epatch "${FILESDIR}/${PV}-0007-dracut.sh-also-mkdir-run-lock-which-is.patch"
-	epatch "${FILESDIR}/${PV}-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch"
-	epatch "${FILESDIR}/${PV}-0009-lvm-install-thin-utils-for-non-hostonl.patch"
-	epatch "${FILESDIR}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
-	epatch "${FILESDIR}/${PV}-0011-lvm-fix-thin-recognition.patch"
-	epatch "${FILESDIR}/${PV}-0012-lvm-always-install-thin-utils-for-lvm.patch"
-	epatch "${FILESDIR}/${PV}-0013-usrmount-always-install.patch"
-	epatch "${FILESDIR}/${PV}-0014-udev-rules-add-eudev-rules.patch"
-
-	local libdirs
-
-	#local ldir
-	#for ldir in $(get_all_libdirs); do
-	#	libdirs+=" /$ldir /usr/$ldir"
-	#done
-	#libdirs="${libdirs# }"
-
-	libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--libdir=${MY_LIBDIR}"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install
-}
-
-src_install() {
-	default
-
-	local my_libdir="${MY_LIBDIR}"
-	local dracutlibdir="${my_libdir#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-034-r4.ebuild b/sys-kernel/dracut/dracut-034-r4.ebuild
index 91997e4ac74b..341930ed1de8 100644
--- a/sys-kernel/dracut/dracut-034-r4.ebuild
+++ b/sys-kernel/dracut/dracut-034-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-034-r4.ebuild,v 1.2 2013/12/28 17:41:17 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-034-r4.ebuild,v 1.3 2014/01/19 11:27:02 aidecoe Exp $
 
 EAPI=4
 
@@ -18,7 +18,9 @@ add_req_use_for() {
 
 DESCRIPTION="Generic initramfs generation tool"
 HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
+AIDECOE_DISTFILES="http://dev.gentoo.org/~aidecoe/distfiles"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2
+	${AIDECOE_DISTFILES}/${CATEGORY}/${PN}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -166,7 +168,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-0007-dracut.sh-also-mkdir-run-lock-which-is.patch"
 	epatch "${FILESDIR}/${PV}-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch"
 	epatch "${FILESDIR}/${PV}-0009-lvm-install-thin-utils-for-non-hostonl.patch"
-	epatch "${FILESDIR}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
+	epatch "${DISTDIR}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
 	epatch "${FILESDIR}/${PV}-0011-lvm-fix-thin-recognition.patch"
 	epatch "${FILESDIR}/${PV}-0012-lvm-always-install-thin-utils-for-lvm.patch"
 	epatch "${FILESDIR}/${PV}-0013-usrmount-always-install.patch"
diff --git a/sys-kernel/dracut/files/026-0000-fix-version-print.patch b/sys-kernel/dracut/files/026-0000-fix-version-print.patch
deleted file mode 100644
index 3607fb24552c..000000000000
--- a/sys-kernel/dracut/files/026-0000-fix-version-print.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index b441a27..410201a 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -104,7 +104,7 @@ else
- fi
- 
- [ -f /etc/initrd-release ] && . /etc/initrd-release
--[ -n "$VERSION" ] && info "dracut-$VERSION"
-+[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
- 
- source_conf /etc/conf.d
- 
diff --git a/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index 05aad68a656a..000000000000
--- a/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 76e3d3ac2d753f17c59dfe9758ea36897bedaddf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/3] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 2a84d17..a6a609c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -955,6 +955,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 6ae84ec8af9e..000000000000
--- a/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f4bfd74c673c5f4d01cf9855f2e4f58c59f5b658 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/3] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch b/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch
deleted file mode 100644
index 6fc948269c66..000000000000
--- a/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a6b0fde8f776d28988a9ab4e5bf09f78fa858744 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 10 Mar 2013 13:31:02 +0100
-Subject: [PATCH 3/3] Revert "crypt, dmraid, mdraid: use
- for_each_host_dev_and_slaves_all()"
-
-This reverts commit cf24ac8c19b803e6f5c0576f2d7e78187331cf02.
----
- modules.d/90crypt/module-setup.sh  | 2 +-
- modules.d/90dmraid/module-setup.sh | 2 +-
- modules.d/90mdraid/module-setup.sh | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 2b4456b..93b996c 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -25,7 +25,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_crypt || return 1
-+        for_each_host_dev_fs check_crypt || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
-index c315961..eb949dc 100755
---- a/modules.d/90dmraid/module-setup.sh
-+++ b/modules.d/90dmraid/module-setup.sh
-@@ -38,7 +38,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_dmraid || return 1
-+        for_each_host_dev_fs check_dmraid || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 0efffbb..a2b9ac2 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -27,7 +27,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_mdraid || return 1
-+        for_each_host_dev_fs check_mdraid || return 1
-     }
- 
-     return 0
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch b/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch
deleted file mode 100644
index 371644b25a2b..000000000000
--- a/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f6e0e5653fac1f856192bfafdcb2fbd86ed8a22a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Sun, 10 Mar 2013 14:44:32 +0100
-Subject: [PATCH 3/5] lsinitrd.sh: fix for default initrd not found, but image
- given
-
----
- lsinitrd.sh | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 7a09423..4b8a7e2 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -54,16 +54,17 @@ if [[ "$1" ]]; then
-         usage
-         exit 1
-     fi
--fi
--
--[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
--
--if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
--    image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
- else
--    image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
-+
-+    if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
-+        image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-+    else
-+        image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+    fi
- fi
- 
-+
- if ! [[ -f "$image" ]]; then
-     {
-         echo "No <initramfs file> specified and the default image '$image' cannot be accessed!"
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch b/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch
deleted file mode 100644
index de2b87866699..000000000000
--- a/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf7a572d8f978e16d92385ebf36e2f837fc2f3d1 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 11 Mar 2013 15:46:37 +0100
-Subject: [PATCH 4/5] lsinitrd.sh: removed trailing "}"
-
----
- lsinitrd.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 4b8a7e2..5cd8c2a 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -60,7 +60,7 @@ else
-     if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
-         image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-     else
--        image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+        image="/boot/initramfs-${KERNEL_VERSION}.img"
-     fi
- fi
- 
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch b/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch
deleted file mode 100644
index 13b28c5e16fb..000000000000
--- a/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From 86152848ed452bf1a01d0bea25c47ea54884a4fd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 11 Mar 2013 16:32:16 +0100
-Subject: [PATCH 5/5] make host_fs_types a hashmap
-
-This requires bash >= 4, but hash maps are so much more comfortable
----
- dracut-functions.sh                | 14 +++---------
- dracut.sh                          | 23 +++++++++----------
- modules.d/90btrfs/module-setup.sh  |  6 ++---
- modules.d/90crypt/module-setup.sh  | 39 +++++++++++++++++++--------------
- modules.d/90dmraid/module-setup.sh | 34 ++++++++++++++++------------
- modules.d/90lvm/module-setup.sh    | 36 +++++++++++++++++-------------
- modules.d/90mdraid/module-setup.sh | 45 +++++++++++++++++++++-----------------
- modules.d/95cifs/module-setup.sh   |  2 +-
- modules.d/95nfs/module-setup.sh    |  6 ++---
- modules.d/95virtfs/module-setup.sh |  4 ++--
- 10 files changed, 112 insertions(+), 97 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index a6a609c..52a1781 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -450,23 +450,15 @@ find_mp_fstype() {
- find_root_block_device() { find_block_device /; }
- 
- # for_each_host_dev_fs <func>
--# Execute "<func> <dev> <filesystem>" for every "<dev>|<fs>" pair found
-+# Execute "<func> <dev> <filesystem>" for every "<dev> <fs>" pair found
- # in ${host_fs_types[@]}
- for_each_host_dev_fs()
- {
-     local _func="$1"
-     local _dev
--    local _fs
-     local _ret=1
--    for f in ${host_fs_types[@]}; do
--        OLDIFS="$IFS"
--        IFS="|"
--        set -- $f
--        IFS="$OLDIFS"
--        _dev="$1"
--        [[ -b "$_dev" ]] || continue
--        _fs="$2"
--        $_func $_dev $_fs && _ret=0
-+    for _dev in "${!host_fs_types[@]}"; do
-+        $_func "$_dev" "${host_fs_types[$_dev]}" && _ret=0
-     done
-     return $_ret
- }
-diff --git a/dracut.sh b/dracut.sh
-index 28ed4f1..15e66f3 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -744,11 +744,13 @@ trap 'exit 1;' SIGINT
- # Need to be able to have non-root users read stuff (rpcbind etc)
- chmod 755 "$initdir"
- 
-+declare -A host_fs_types
-+
- for line in "${fstab_lines[@]}"; do
-     set -- $line
-     #dev mp fs fsopts
-     push host_devs "$1"
--    push host_fs_types "$1|$3"
-+    host_fs_types["$1"]="$3"
- done
- 
- for f in $add_fstab; do
-@@ -791,28 +793,27 @@ fi
- _get_fs_type() (
-     [[ $1 ]] || return
-     if [[ -b $1 ]] && get_fs_env $1; then
--        echo "$(readlink -f $1)|$ID_FS_TYPE"
-+        echo "$(readlink -f $1) $ID_FS_TYPE"
-         return 1
-     fi
-     if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
--        echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE"
-+        echo "$(readlink -f /dev/block/$1) $ID_FS_TYPE"
-         return 1
-     fi
-     if fstype=$(find_dev_fstype $1); then
--        echo "$1|$fstype"
-+        echo "$1 $fstype"
-         return 1
-     fi
-     return 1
- )
- 
- for dev in "${host_devs[@]}"; do
--    unset fs_type
--    for fstype in $(_get_fs_type $dev) \
--        $(check_block_and_slaves _get_fs_type $(get_maj_min $dev)); do
--        if ! strstr " ${host_fs_types[*]} " " $fstype ";then
--            push host_fs_types "$fstype"
--        fi
--    done
-+    while read key val; do
-+        host_fs_types["$key"]="$val"
-+    done < <(
-+        _get_fs_type $dev
-+        check_block_and_slaves_all _get_fs_type $(get_maj_min $dev)
-+    )
- done
- 
- [[ -d $udevdir ]] \
-diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
-index 0f79f5e..4a7c01d 100755
---- a/modules.d/90btrfs/module-setup.sh
-+++ b/modules.d/90btrfs/module-setup.sh
-@@ -9,12 +9,10 @@ check() {
-     type -P btrfs >/dev/null || return 1
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        local _found
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|btrfs" && _found="1"
-+            [[ "$fs" == "btrfs" ]] && return 0
-         done
--        [[ $_found ]] || return 1
--        unset _found
-+        return 255
-     }
- 
-     return 0
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 2b4456b..b76f6ae 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -7,8 +7,30 @@ check() {
-     # if cryptsetup is not installed, then we cannot support encrypted devices.
-     type -P cryptsetup >/dev/null || return 1
- 
-+    [[ $hostonly ]] || [[ $mount_needs ]] && {
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = "crypto_LUKS" ]] && return 0
-+        done
-+        return 255
-+    }
-+
-+    return 0
-+}
-+
-+depends() {
-+    echo dm rootfs-block
-+    return 0
-+}
-+
-+installkernel() {
-+    instmods dm_crypt =crypto
-+}
-+
-+install() {
-+
-     check_crypt() {
-         local dev=$1 fs=$2
-+
-         [[ $fs = "crypto_LUKS" ]] || return 1
-         ID_FS_UUID=$(udevadm info --query=property --name=$dev \
-             | while read line; do
-@@ -24,23 +46,8 @@ check() {
-         return 0
-     }
- 
--    [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_crypt || return 1
--    }
--
--    return 0
--}
--
--depends() {
--    echo dm rootfs-block
--    return 0
--}
--
--installkernel() {
--    instmods dm_crypt =crypto
--}
-+    for_each_host_dev_fs check_crypt
- 
--install() {
-     dracut_install cryptsetup rmdir readlink umount
-     inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
-     inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
-diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
-index c315961..76daa4a 100755
---- a/modules.d/90dmraid/module-setup.sh
-+++ b/modules.d/90dmraid/module-setup.sh
-@@ -8,9 +8,27 @@ check() {
-     # in trying to support it in the initramfs.
-     type -P dmraid >/dev/null || return 1
- 
-+    [[ $hostonly ]] || [[ $mount_needs ]] && {
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = *_raid_member ]] && return 0
-+        done
-+        return 255
-+    }
-+
-+    return 0
-+}
-+
-+depends() {
-+    echo dm rootfs-block
-+    return 0
-+}
-+
-+install() {
-+    local _i
-+
-     check_dmraid() {
-         local dev=$1 fs=$2 holder DEVPATH DM_NAME
--        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1
-+        [[ "$fs" != *_raid_member ]] && return 1
- 
-         DEVPATH=$(udevadm info --query=property --name=$dev \
-             | while read line; do
-@@ -37,20 +55,8 @@ check() {
-         return 0
-     }
- 
--    [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_dmraid || return 1
--    }
-+    for_each_host_dev_fs check_dmraid
- 
--    return 0
--}
--
--depends() {
--    echo dm rootfs-block
--    return 0
--}
--
--install() {
--    local _i
-     dracut_install dmraid
-     dracut_install -o kpartx
-     inst $(command -v partx) /sbin/partx
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index e0e4043..22186f4 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -7,22 +7,11 @@ check() {
-     # No point trying to support lvm if the binaries are missing
-     type -P lvm >/dev/null || return 1
- 
--    check_lvm() {
--        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
--        eval $(udevadm info --query=property --name=/dev/block/$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
--        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
--        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
--        if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
--            if ! [[ $kernel_only ]]; then
--                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
--            fi
--            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
--        fi
--        return 0
--    }
--
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_lvm || return 1
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = LVM*_member ]] && return 0
-+        done
-+        return 255
-     }
- 
-     return 0
-@@ -38,6 +27,23 @@ install() {
-     local _i
-     inst lvm
- 
-+    check_lvm() {
-+        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
-+
-+        eval $(udevadm info --query=property --name=$1 | egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
-+        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
-+        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
-+        if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
-+            if ! [[ $kernel_only ]]; then
-+                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
-+            fi
-+            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
-+        fi
-+        return 0
-+    }
-+
-+    for_each_host_dev_fs check_lvm
-+
-     inst_rules "$moddir/64-lvm.rules"
- 
-     if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 0efffbb..70c27dd 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -7,27 +7,11 @@ check() {
-     # No mdadm?  No mdraid support.
-     type -P mdadm >/dev/null || return 1
- 
--    check_mdraid() {
--        local dev=$1 fs=$2 holder DEVPATH MD_UUID
--        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1
--
--        MD_UUID=$(/sbin/mdadm --examine --export $dev \
--            | while read line; do
--                [[ ${line#MD_UUID} = $line ]] && continue
--                eval "$line"
--                echo $MD_UUID
--                break
--                done)
--
--        [[ ${MD_UUID} ]] || return 1
--        if ! [[ $kernel_only ]]; then
--            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
--        fi
--        return 0
--    }
--
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_mdraid || return 1
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ "$fs" == *_raid_member ]] && return 0
-+        done
-+        return 255
-     }
- 
-     return 0
-@@ -48,6 +32,27 @@ install() {
-     inst $(command -v partx) /sbin/partx
-     inst $(command -v mdadm) /sbin/mdadm
- 
-+    check_mdraid() {
-+        local dev=$1 fs=$2 holder DEVPATH MD_UUID
-+        [[ "$fs" != *_raid_member ]] && return 1
-+
-+        MD_UUID=$(/sbin/mdadm --examine --export $dev \
-+            | while read line; do
-+                [[ ${line#MD_UUID} = $line ]] && continue
-+                eval "$line"
-+                echo $MD_UUID
-+                break
-+                done)
-+
-+        [[ ${MD_UUID} ]] || return 1
-+        if ! [[ $kernel_only ]]; then
-+            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
-+        fi
-+        return 0
-+    }
-+
-+    for_each_host_dev_fs check_mdraid
-+
-     inst_rules 64-md-raid.rules
-     # remove incremental assembly from stock rules, so they don't shadow
-     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
-diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
-index 1c7d0be..bf0eddf 100755
---- a/modules.d/95cifs/module-setup.sh
-+++ b/modules.d/95cifs/module-setup.sh
-@@ -8,7 +8,7 @@ check() {
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|cifs"  && return 0
-+            [[ "$fs" == "cifs" ]] && return 0
-         done
-         return 255
-     }
-diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
-index 38ee5d7..7c3a64d 100755
---- a/modules.d/95nfs/module-setup.sh
-+++ b/modules.d/95nfs/module-setup.sh
-@@ -9,9 +9,9 @@ check() {
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|nfs"  && return 0
--            strstr "$fs" "\|nfs3" && return 0
--            strstr "$fs" "\|nfs4" && return 0
-+            [[ "$fs" == "nfs" ]] && return 0
-+            [[ "$fs" == "nfs3" ]] && return 0
-+            [[ "$fs" == "nfs4" ]] && return 0
-         done
-         return 255
-     }
-diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh
-index 0b961a8..12bd354 100755
---- a/modules.d/95virtfs/module-setup.sh
-+++ b/modules.d/95virtfs/module-setup.sh
-@@ -5,9 +5,9 @@
- check() {
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|9p" && return 0
-+            [[ "$fs" == "9p" ]] && return 0
-         done
--        return 1
-+        return 255
-     }
- 
-     if type -P systemd-detect-virt >/dev/null 2>&1; then
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/027-0000-fix-version-print.patch b/sys-kernel/dracut/files/027-0000-fix-version-print.patch
deleted file mode 100644
index 3607fb24552c..000000000000
--- a/sys-kernel/dracut/files/027-0000-fix-version-print.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index b441a27..410201a 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -104,7 +104,7 @@ else
- fi
- 
- [ -f /etc/initrd-release ] && . /etc/initrd-release
--[ -n "$VERSION" ] && info "dracut-$VERSION"
-+[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
- 
- source_conf /etc/conf.d
- 
diff --git a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index ca079ad40d65..000000000000
--- a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index eba7412..d888f4c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -961,6 +961,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.1.5
-
diff --git a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index d110afa83966..000000000000
--- a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.1.5
-
diff --git a/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch b/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch
deleted file mode 100644
index 55a6630969d8..000000000000
--- a/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From d084ce382e70723854f960daa8b0e486ee1ce97f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 16:08:26 +0200
-Subject: [PATCH 3/4] Do not call plymouth with full path
-
----
- modules.d/50plymouth/module-setup.sh             | 2 +-
- modules.d/50plymouth/plymouth-emergency.sh       | 2 +-
- modules.d/50plymouth/plymouth-newroot.sh         | 4 ++--
- modules.d/50plymouth/plymouth-populate-initrd.sh | 5 ++---
- modules.d/50plymouth/plymouth-pretrigger.sh      | 6 +++---
- modules.d/90crypt/crypt-lib.sh                   | 4 ++--
- modules.d/90dmsquash-live/dmsquash-live-root.sh  | 4 ++--
- modules.d/98systemd/dracut-emergency.sh          | 2 +-
- modules.d/99base/dracut-lib.sh                   | 4 ++--
- 9 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
-index f754e24..ae35b11 100755
---- a/modules.d/50plymouth/module-setup.sh
-+++ b/modules.d/50plymouth/module-setup.sh
-@@ -4,7 +4,7 @@
- 
- check() {
-     [[ "$mount_needs" ]] && return 1
--    [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
-+    type -P plymouthd >/dev/null && type -P plymouth >/dev/null
- }
- 
- depends() {
-diff --git a/modules.d/50plymouth/plymouth-emergency.sh b/modules.d/50plymouth/plymouth-emergency.sh
-index 68955b8..ed0b0ac 100755
---- a/modules.d/50plymouth/plymouth-emergency.sh
-+++ b/modules.d/50plymouth/plymouth-emergency.sh
-@@ -1,4 +1,4 @@
- #!/bin/sh
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
--[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+plymouth --hide-splash 2>/dev/null || :
-diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh
-index 2311b47..96cd138 100755
---- a/modules.d/50plymouth/plymouth-newroot.sh
-+++ b/modules.d/50plymouth/plymouth-newroot.sh
-@@ -2,6 +2,6 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
--    /bin/plymouth --newroot=$NEWROOT
-+if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
-+    plymouth --newroot=$NEWROOT
- fi
-diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh
-index 1e2ffe7..6e0f561 100755
---- a/modules.d/50plymouth/plymouth-populate-initrd.sh
-+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
-@@ -4,15 +4,14 @@
- PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
- 
--inst /sbin/plymouthd /bin/plymouthd
--dracut_install /bin/plymouth \
-+dracut_install plymouthd plymouth \
-     "${PLYMOUTH_LOGO_FILE}" \
-     /etc/system-release
- 
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
- 
- inst_libdir_file "plymouth/text.so" "plymouth/details.so"
--    
-+
- if [[ $hostonly ]]; then
-     dracut_install \
-         "/usr/share/plymouth/themes/details/details.plymouth" \
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 0e3cb02..8087bf6 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
-     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
-         # first trigger graphics subsystem
-         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
-@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
-         read consoledev rest < /sys/class/tty/console/active
-         consoledev=${consoledev:-tty0}
-         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
--        [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
--        /bin/plymouth --show-splash 2>&1 | vinfo
-+        plymouthd --attach-to-session --pid-file /run/plymouth/pid
-+        plymouth --show-splash 2>&1 | vinfo
-         # reset tty after plymouth messed with it
-         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
-     fi
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index d66ba88..ebe09f8 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -47,8 +47,8 @@ ask_for_password() {
- 
-     { flock -s 9;
-         # Prompt for password with plymouth, if installed and running.
--        if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
--            /bin/plymouth ask-for-password \
-+        if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
-+            plymouth ask-for-password \
-                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
-                 --command="$ply_cmd"
-             ret=$?
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index a79b0d9..07e41f0 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
- fi
- getarg rd.live.check -d check || check=""
- if [ -n "$check" ]; then
--    [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+    type plymouth >/dev/null 2>&1 && plymouth --hide-splash
-     if [ -n "$DRACUT_SYSTEMD" ]; then
-         p=$(str_replace "$livedev" "-" '\x2d')
-         systemctl start checkisomd5@${p}.service
-@@ -42,7 +42,7 @@ if [ -n "$check" ]; then
-         die "CD check failed!"
-         exit 1
-     fi
--    [ -x /bin/plymouth ] && /bin/plymouth --show-splash
-+    type plymouth >/dev/null 2>&1 && plymouth --show-splash
- fi
- 
- ln -s $livedev /run/initramfs/livedev
-diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
-index a0a4b12..8ab045e 100755
---- a/modules.d/98systemd/dracut-emergency.sh
-+++ b/modules.d/98systemd/dracut-emergency.sh
-@@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
- 
- source_conf /etc/conf.d
- 
--[ -x /bin/plymouth ] && /bin/plymouth quit
-+type plymouth >/dev/null 2>&1 && plymouth quit
- 
- export _rdshell_name="dracut" action="Boot" hook="emergency"
- 
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index e456b01..b8919f3 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -952,8 +952,8 @@ emergency_shell()
-         shift 2
-     elif [ "$1" = "--shutdown" ]; then
-         _rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
--        if [ -x /bin/plymouth ]; then
--            /bin/plymouth --hide-splash
-+        if type plymouth >/dev/null 2>&1; then
-+            plymouth --hide-splash
-         elif [ -x /oldroot/bin/plymouth ]; then
-             /oldroot/bin/plymouth --hide-splash
-         fi
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch b/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch
deleted file mode 100644
index 52e5b295c524..000000000000
--- a/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 331ebcb5f3530597f49a344c7392c7f330838fdd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 12 Apr 2013 15:25:44 +0200
-Subject: [PATCH 4/4] plymouth/plymouth-pretrigger.sh: fixup of ca2c6936
-
----
- modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 8087bf6..196f2f9 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
-     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
-         # first trigger graphics subsystem
-         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index be8703933996..000000000000
--- a/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae4bcf10ea65b0e6f52279fd7a796d86cc9d21f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3d88c9d..63f92ee 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -927,6 +927,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index eb2c91ffac96..000000000000
--- a/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f884f2a855dbdd3b4fdec489e09b8fd878604b83 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch b/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
deleted file mode 100644
index cb95605e002a..000000000000
--- a/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 37f75e9eb50edc041242a486527dddec114dbd60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 20 Jun 2013 20:33:14 +0200
-Subject: [PATCH 3/3] LatArCyrHeb-16 as a default i18n font for Gentoo
-
----
- dracut.conf.d/gentoo.conf.example | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index b78e5c6..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -11,5 +11,6 @@ ro_mnt=yes
- 
- # i18n
- i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
-+i18n_default_font="LatArCyrHeb-16"
- 
- omit_drivers+=" i2o_scsi"
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index e42e22db2a80..000000000000
--- a/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7db6780bf53c045975e1100b22ced174c19ce3c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/3] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 4e1c90c..1b0c3a3 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -955,6 +955,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index fe0a9581ac42..000000000000
--- a/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From abeb147411551b0b116b3a72306789734ecd7253 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/3] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch b/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
deleted file mode 100644
index 07ec0365d0f5..000000000000
--- a/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b9aa302416387b5e31459c8dde21069e72001e5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 20 Jun 2013 20:33:14 +0200
-Subject: [PATCH 3/3] LatArCyrHeb-16 as a default i18n font for Gentoo
-
----
- dracut.conf.d/gentoo.conf.example | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index b78e5c6..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -11,5 +11,6 @@ ro_mnt=yes
- 
- # i18n
- i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
-+i18n_default_font="LatArCyrHeb-16"
- 
- omit_drivers+=" i2o_scsi"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index a36324a01c7d..000000000000
--- a/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a45dcf7c92d7e7b4ee7b0ff6ab61ae1a90f03f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index eb1278e..eaa023c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -960,6 +960,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 34f8e038d515..000000000000
--- a/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fc2bb603bc17e67c66ffcf53a282aa6fb6a6261c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 26e7314..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch b/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch
deleted file mode 100644
index 7f2b40401f8c..000000000000
--- a/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 744e0fded21d048f191b5dedb6d15ebb03318a20 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 31 Jul 2013 15:55:13 +0200
-Subject: [PATCH 3/3] Revert "base: setup correct system time and time zone in
- initrd"
-
-This reverts commit 77364fd6bb01ea184db73b1a5ad05da984752293.
-
-Too many problems with adjtime in the initramfs
-
-https://bugzilla.redhat.com/show_bug.cgi?id=981617
----
- modules.d/99base/init.sh         |  9 ---------
- modules.d/99base/module-setup.sh | 11 -----------
- 2 files changed, 20 deletions(-)
-
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 0e4cac5..ae73fd2 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -48,15 +48,6 @@ if ! ismounted /dev; then
-     exit 1
- fi
- 
--# setup system time
--if [ -f /etc/adjtime ]; then
--    if strstr "$(cat /etc/adjtime)" LOCAL; then
--        hwclock --hctosys --localtime
--    else
--        hwclock --hctosys --utc
--    fi
--fi
--
- # prepare the /dev directory
- [ ! -h /dev/fd ] && ln -s /proc/self/fd /dev/fd >/dev/null 2>&1
- [ ! -h /dev/stdin ] && ln -s /proc/self/fd/0 /dev/stdin >/dev/null 2>&1
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index c9ee838..842dde6 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -29,17 +29,6 @@ install() {
-     egrep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo  'root:x:0:0::/root:/bin/sh' >> "$initdir/etc/passwd"
-     egrep '^nobody:' /etc/passwd >> "$initdir/etc/passwd"
- 
--    # install /etc/adjtime and time zone data
--    if [[ $hostonly ]]; then
--        dracut_install -o /etc/adjtime \
--                          /etc/localtime
--
--        # Our init.sh script needs hwclock to set system time
--        if ! dracut_module_included "systemd"; then
--            dracut_install -o hwclock
--        fi
--    fi
--
-     # install our scripts and hooks
-     inst_script "$moddir/init.sh" "/init"
-     inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index d87565823aaf..000000000000
--- a/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41ab65b884dbe289ce62f6eb7006f636b2dba878 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
-
-Conflicts:
-	dracut-functions.sh
----
- dracut-functions.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index cf33af5..b5eca31 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -872,6 +872,16 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -e $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_rule_initqueue "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
-                 if [[ -e $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 94a72d312dbe..000000000000
--- a/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 342b61269a21b01844acdbb9b4396f4298e51c88 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 26e7314..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
deleted file mode 100644
index cbff97cc0edd..000000000000
--- a/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7e5b656e5880242b57bda6bf2f0ee8d4c5eb3292 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:37:09 +0200
-Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with
- configure script
-
-Makefile alters destination main dracut script and sets dracutbasedir to
-the value of pkglibdir set in configure.
----
- Makefile  | 3 +++
- dracut.sh | 9 ++++-----
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 124a41b..ea504f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -91,6 +91,9 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
-+	sed -r \
-+		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
-+		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
- 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
- 	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
-diff --git a/dracut.sh b/dracut.sh
-index bd905e3..768b76d 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -26,10 +26,13 @@
- # store for logging
- dracut_args=( "$@" )
- 
-+# base dirs
-+pkglibdir=/usr/lib/dracut
-+dracutbasedir="$pkglibdir"
-+
- set -o pipefail
- 
- usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -54,7 +57,6 @@ EOF
- }
- 
- long_usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -542,8 +544,6 @@ export DRACUT_LOG_LEVEL=warning
-     debug=yes
- }
- 
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
--
- # if we were not passed a config file, try the default one
- if [[ ! -f $conffile ]]; then
-     if [[ $allowlocal ]]; then
-@@ -660,7 +660,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
- [[ $tmpdir ]] || tmpdir=/var/tmp
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch
deleted file mode 100644
index aaa568481d63..000000000000
--- a/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From ddde4cb83f5f7bd5e4b4e7d8d094c3d8dbd59211 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:40:43 +0200
-Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib
- dir
-
-dracut-install script is the only thing ABI specific atm.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
-problem.
----
- Makefile            | 4 +++-
- configure           | 1 +
- dracut-functions.sh | 4 ++++
- dracut.sh           | 1 +
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ea504f5..e004a79 100644
---- a/Makefile
-+++ b/Makefile
-@@ -92,6 +92,7 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
- 	sed -r \
-+		-e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
- 		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
- 		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
-@@ -135,7 +136,8 @@ endif
- 		done \
- 	fi
- 	if [ -f install/dracut-install ]; then \
--		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
-+		mkdir -p $(DESTDIR)$(libexecdir); \
-+		install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
- 	fi
- 	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
- 	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
-diff --git a/configure b/configure
-index 19b5e1f..d2ffc2c 100755
---- a/configure
-+++ b/configure
-@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
- mandir ?= ${mandir:-${prefix}/share/man}
- enable_documentation ?= ${enable_documentation:-yes}
- bindir ?= ${bindir:-${prefix}/bin}
-+libexecdir ?= ${libexecdir:-${prefix}/libexec}
- EOF
- 
- {
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index b5eca31..d6489d6 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
-     DRACUT_INSTALL=$(find_binary dracut-install)
- fi
- 
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
-+    DRACUT_INSTALL=$libexecdir/dracut-install
-+fi
-+
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
-     DRACUT_INSTALL=$dracutbasedir/dracut-install
- fi
-diff --git a/dracut.sh b/dracut.sh
-index 768b76d..066d9d6 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -27,6 +27,7 @@
- dracut_args=( "$@" )
- 
- # base dirs
-+libexecdir=/usr/libexec
- pkglibdir=/usr/lib/dracut
- dracutbasedir="$pkglibdir"
- 
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch b/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch
deleted file mode 100644
index 0c775702f9d1..000000000000
--- a/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5e588b0713bf149660817979e25fd443e319aeb9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 13 Sep 2013 16:33:01 +0200
-Subject: [PATCH 5/9] dracut.sh: harden host_modalias reading
-
-Some weird PPC driver make their modulias unreadable
-
-$ cat /sys/devices/vio/4000/modalias
-cat: /sys/devices/vio/4000/modalias: No such device
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 066d9d6..bc46b1c 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -921,7 +921,7 @@ if [[ $hostonly ]]; then
-     declare -A host_modalias
-     find  /sys/devices/ -name modalias -print > "$initdir/.modalias"
-     while read m; do
--        host_modalias["$(<"$m")"]=1
-+        modalias="$(<"$m")" && [[ $modalias ]] && host_modalias["$modalias"]=1
-     done < "$initdir/.modalias"
-     rm -f -- "$initdir/.modalias"
- 
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch b/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch
deleted file mode 100644
index fd15add1a0f5..000000000000
--- a/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dc03b57ca7fe5f83dc91b2d6b44aa67d83ccd399 Mon Sep 17 00:00:00 2001
-From: WANG Chao <chaowang@redhat.com>
-Date: Fri, 13 Sep 2013 22:28:44 +0800
-Subject: [PATCH 6/9] ifup: do not dhcp on network interface of secondary stack
-
-Configure cmdline to:
- ip=br0:dhcp bridge=br0:bond0 bond=bond0:eth0
-
-By default ifup bond0 will run dhcp on bond0, which is wrong. bond0
-isn't the top interface. we should really run dhcp on br0.
-
-So if we ifup an network interface on secondary stack, we should not
-dhcp. Fix this issue with this patch.
----
- modules.d/40network/ifup.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 3261647..9f6f449 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -336,6 +336,13 @@ for p in $(getargs ip=); do
-     exit 0
- done
- 
-+# netif isn't the top stack? Then we should exit here.
-+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp
-+#     bond0 doesn't make sense.
-+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then
-+    exit 0
-+fi
-+
- # no ip option directed at our interface?
- if [ ! -e /tmp/setup_net_${netif}.ok ]; then
-     do_dhcp -4
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch b/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch
deleted file mode 100644
index 3663d6e6fb6f..000000000000
--- a/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cb669ae9816be6d213b68c380b5720f05d43e4c7 Mon Sep 17 00:00:00 2001
-From: Peter Rajnoha <prajnoha@redhat.com>
-Date: Fri, 4 Oct 2013 10:41:24 +0200
-Subject: [PATCH 7/9] lvm/mdraid: Fix LVM on MD activation
-
-The 69-dm-lvm-metad.rules set some udev env. variables that makes it
-possible to detect the right time to activate LVM on MD. The MD is very
-similar to DM during activation - it's usable only after proper device
-activation - the CHANGE event. We need to make a difference between a
-CHANGE event that comes from this activation and CHANGE event that is
-the outcome of the WATCH udev rule (otherwise we'd end up with LVM
-activation done on each CHANGE event - which is wrong).
-
-So we need the udev databse to be persistent during pivot to root fs
-even for MD devices.
----
- modules.d/90lvm/module-setup.sh                   | 2 +-
- modules.d/90mdraid/59-persistent-storage-md.rules | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 2ef9a51..f98ffff 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -82,7 +82,7 @@ install() {
-         } > "${initdir}/etc/lvm/lvm.conf"
-     fi
- 
--    inst_rules 11-dm-lvm.rules
-+    inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
-     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-     # files, but provides the one below:
-     inst_rules 64-device-mapper.rules
-diff --git a/modules.d/90mdraid/59-persistent-storage-md.rules b/modules.d/90mdraid/59-persistent-storage-md.rules
-index bea9325..6ef858a 100644
---- a/modules.d/90mdraid/59-persistent-storage-md.rules
-+++ b/modules.d/90mdraid/59-persistent-storage-md.rules
-@@ -20,4 +20,5 @@ IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
- IMPORT BLKID
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
-+OPTIONS+="db_persist"
- LABEL="md_end"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch b/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch
deleted file mode 100644
index c6e8d99af602..000000000000
--- a/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5821cc78250075a855175572c420808cddcf40f5 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Thu, 3 Oct 2013 14:54:42 +0400
-Subject: [PATCH 8/9] mdraid/module-setup.sh: install configs from
- /etc/mdadm.conf.d
-
-/etc/mdadm.conf.d directory is supported since mdadm-3.3
----
- modules.d/90mdraid/module-setup.sh | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 5df2274..45767c6 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -93,6 +93,14 @@ install() {
-         else
-             [ -f /etc/mdadm/mdadm.conf ] && inst /etc/mdadm/mdadm.conf /etc/mdadm.conf
-         fi
-+        if [ -d /etc/mdadm.conf.d ]; then
-+            local f
-+            inst_dir /etc/mdadm.conf.d
-+            for f in /etc/mdadm.conf.d/*.conf; do
-+                [ -f "$f" ] || continue
-+                inst "$f"
-+            done
-+        fi
-     fi
- 
-     inst_hook pre-udev 30 "$moddir/mdmon-pre-udev.sh"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch b/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch
deleted file mode 100644
index af4efb1d9968..000000000000
--- a/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8cdb852fd2aa4d0746baee04018cde9b3fd04ddd Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sun, 29 Sep 2013 01:31:01 +0400
-Subject: [PATCH 9/9] mdraid/module-setup.sh: fixes for mdadm-3.2.6+
-
-mdadm-3.2.6+:
-Incremental assembly rule contains "--offroot" arg. Update
-regexp to catch this variant.
-
-mdadm-3.3+:
-Rules was splitted into two files: 63-md-raid-arrays.rules
-and 64-md-raid-assembly.rules. Install them both and edit
-the latter.
----
- modules.d/90mdraid/module-setup.sh | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 45767c6..34aae1e 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -59,6 +59,7 @@ cmdline() {
- }
- 
- install() {
-+    local rule rule_path
-     inst_multiple cat
-     inst_multiple -o mdmon
-     inst $(command -v partx) /sbin/partx
-@@ -67,12 +68,20 @@ install() {
-     cmdline  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
-     echo  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
- 
-+    # <mdadm-3.3 udev rule
-     inst_rules 64-md-raid.rules
-+    # >=mdadm-3.3 udev rules
-+    inst_rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules
-     # remove incremental assembly from stock rules, so they don't shadow
-     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
-     # when we explicitly don't want certain components to be incrementally
-     # assembled
--    sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}${udevdir}/rules.d/64-md-raid.rules"
-+    for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do
-+        rule_path="${initdir}${udevdir}/rules.d/${rule}"
-+        [ -f "${rule_path}" ] && sed -i -r \
-+            -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \
-+            "${rule_path}"
-+    done
- 
-     inst_rules "$moddir/65-md-incremental-imsm.rules"
- 
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/034-0010-module-setup.sh-add-comments.patch.bz2 b/sys-kernel/dracut/files/034-0010-module-setup.sh-add-comments.patch.bz2
deleted file mode 100644
index e6f5589c9f43..000000000000
Binary files a/sys-kernel/dracut/files/034-0010-module-setup.sh-add-comments.patch.bz2 and /dev/null differ
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index b4cb2c71bc99..c117f3f30d83 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -18,9 +18,6 @@
 			so.</flag>
 		<flag name="net">Set of helper modules providing networking support. You
 			need to enable this only if emerge says so.</flag>
-		<flag name="optimization">Build optimized version of dracut_install
-			function.  It will be used instead of the one written in
-			bash.</flag>
 	</use>
 	<longdescription lang="en">
 	Generic, modular initramfs generation tool that can be used across various
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 586cdb125cf1..2b1f920c5a17 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,38 +1,29 @@
 DIST deblob-2.6.32 84094 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d SHA512 81263cf9f0e8232f9d56966082514f58c147d12cce0bce384f6830a450006006274f3009dd11c38638cd083d0efc14dc2edd1b79ca22a18835eeee4e9ea15eab WHIRLPOOL c53c3f114e7536426c7f303c8d67ee5d26929ca59b25b5fdcf18b2748acc4699cda42f63908db6f78ab338301da8cad3b3ecbab45ee5c1f15679d4e44042dec4
-DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.11 119401 SHA256 78bf8169e466a2082c6bedca0431bdbe15a55f4ba96c16a631587f23e0cdef25 SHA512 d6f87cf2d9c0a7f59a52c5a890015e050ba684d34f9e81ff8386ab57247718d0b10b6cd8a68ce3dd25711936b660b7cf512cacf31a3467b9b70a3e3e8433e142 WHIRLPOOL 026a2ff10994be722b08b1638366be8311c685c69214db9449e605477f81b817a8c2ca1e4d8617d61f7f66a6f287c74f68a679bc81ff3364d0245eb3ea84fe36
 DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
 DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20 SHA512 f34b7128adf716c908cbbbfefe72149fcd88b727d27edab43be65d4e6a55112b6d937d5c2bed86454d58781f3766ba4cc6db668cb6174a6039d276499da37cb4 WHIRLPOOL 0922457f7ca413c9d8115182964a7c051560799c4724452f81cb4c0383cf62c45b0364d6e639bd9d2b9000411d8773cabd2e8af99e8b0dc7f7bdc886db432d6d
 DIST deblob-check-2.6.32 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3 SHA512 2ba5c7615164a96847afc40af9c9883dc39d8be633e8f07d0d4a6c16b1a22117faf68d5aa40c5aee843dc687a635e2195a4be3bfa40f87dc2b89554d869616b6 WHIRLPOOL ea5dcfd0ee58f1e9ff8dc16229401d37c0271fcae9d065ec648828088cd8d0b8eb8a80efc772d1ed0f075017485609ebf19c01156586728dd335af2dee2bbeff
-DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
 DIST deblob-check-3.11 589384 SHA256 6931c59ed9f03e2f11038997e430e9c04d51fe2d00dc6f8a134d92e1eba72fdb SHA512 315c50141967adb7952bc83a374f94d9b70a1027d6cd4a4b76d4fa4108ea7159cedb599e65ba531af1c1ef869e203aa1a03225e210cddd996120977d4886a25a WHIRLPOOL c079786436dc55773de9f5fc1bccd265049e58b74618fba534cd5964d881c107ecb705de68e3a7f02d1e285ebad9b2d7e985a4b6603fa3460b503c6db1ff1ad2
 DIST deblob-check-3.12 601108 SHA256 e6c07b4220f86007ea31f9ed5d01023253296ddaa0710e65e08f231eccf6085a SHA512 fb293fb5093c410b319203cf0a65457a3ef28430ad6257b08a6e3eb77011d79708c51121c0a8776f55124259719782b4ac9b4c54155c13bb05a2679541816887 WHIRLPOOL e056b4edccd36911fe415cd1780bb484875a16237dce89316144c8ee07df3253bc19abdbee2e51ab3dd9248682470e80409819584c188e22601026e8df222754
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
 DIST genpatches-2.6.32-48.base.tar.xz 907780 SHA256 aafa99cbd0ff38c9fccd3ce6780b2f3c261e3e66415dc8b14870959b94498c73 SHA512 eebadf08d5a01165d7e57e0d5adc70de33854b5b57c69edba5c0e6672288479da33f57c89a0fe838067aa5ca3663c47b22c98c34929ef66c5740e945af5c0317 WHIRLPOOL 3906c3e0c9a7a66c4cc710d506ec56d97fc6ac878c2aa22b1a2ad3ce10d3aae8cfbd54d9f78fa78b3ce41fdf291b8ee955692e4759758f2edac5e24e9f342c41
 DIST genpatches-2.6.32-48.extras.tar.xz 24436 SHA256 87b9ba845a35f737088362921720403bc348554031f8956ae20b30ade53b7c64 SHA512 de7c110f5f86f865410cfc408eccd3052a5b7777065f06cbeb3c22c3642db9424235df19ea418e2354ff3aabcc915b0b85cf6e06537f6600d7b30e2f79220508 WHIRLPOOL 755f5e34fec49976f634c43ab459cb13703e6595ca84808d18919a01d7735bf97f16625102b384d67d4360bd3d9a07d21ab50e16b945edb9df8231a26cfa7169
-DIST genpatches-3.10-3.base.tar.xz 52604 SHA256 56b05e27e86960023523c06e9c8f9fbd52285d2ef52cef6028bfbf10802ae094 SHA512 7bff65187302839e1407f72dc5d61652e362fb824126db9653a2a2db98d512e96b9675d99a400caaf500458d8a7b2b8050345ddfdf574653d3c1315fbf066c80 WHIRLPOOL 6c9ff586694fc60206e2f84ac97017c954dce45688528482bf329b2f3d6eeb953c6cc27bfad619ea94270201a2d80b1eea9ad729220b651ddc6b4468819bfa97
 DIST genpatches-3.11-10.base.tar.xz 164896 SHA256 02cea38d624fb6c830af164fe709e22c92cdfbfac2c752af4ff145681f5ae0ac SHA512 c80625740d5670ee511b90b7a2b29881b7b5f14b5276e0be7d7e307404788355cde252c46440c2c60fe117c1bb43bc24ba3323beaaf3aa415d44aabd194b52ef WHIRLPOOL 67f3825dd6a7c1b35d3a198c595646acb4f150904599ee8aab9999a92bebcb18ddd02f14fd01eac423518a94bdfc1fb61c97d1cc616ab96d326f622fe99a2bb2
 DIST genpatches-3.11-4.base.tar.xz 11644 SHA256 5f731b81d81686837d65baadabb9c415c78a0d0356cc78d9931d4cec816fd5b6 SHA512 11f92ce478277c7e3beb9a6980d8eb2778847d81c7bc992c223a2fcf932b392b9716446c7947b3842565a813b5f3cfcf16125067f7808518f746f87a553f99e8 WHIRLPOOL 1d2742e512a54d45e22bb1f0761fb7aecd8de14799d6bb5115c2c3d748f70ab7286844f89304eb0b369d07543f0964ba262dc144ed57f3a108418718093eb2a7
-DIST genpatches-3.12-7.base.tar.xz 195620 SHA256 00d27da9e21cee279cf4ed4d8b80adad291b4ed15ca9ac337b3c4bfbd9ee3a51 SHA512 7fe1651f0d3188ddc7987a5a133c8e612f1e9b319251d9ca3ae3a7dfd23a57bdc1117d1b4793072a3859cb1f631b6dac3902315326143f579260ff9c5639bd5e WHIRLPOOL 60f85a0d37ba59a4d9cb9355b9f176b650dea4b2f4fce4c285edec9bce34cd54f89e196393249523bf95653d69ab08444db4a3ed394dccd08fb800d5974fd6b7
+DIST genpatches-3.12-9.base.tar.xz 255288 SHA256 cb298100c98f0532113e798026da02cad6436c4bdb6391d142cf35655fa90e49 SHA512 1bc58569399d98d4a0bf38fad07fe56eed52c00f69afc4cde1ad46144be6719855e8dca0148fa4b675525ff69fb79bf06c93f494a2cf7c8dd80898bab6bccab6 WHIRLPOOL 6f9c0a11209b11a182f8a21d2fc6b29ff379f9aea4828609a1ec5f56262fb594b1049ab414de631be8414d233866ba7aee873e36b2d42a33e4d7b5d3a187f119
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
-DIST hardened-patches-2.6.32-183.extras.tar.bz2 978467 SHA256 445dd8e90100663e9c52f64a841519df93a7086206fcafdec9bea482ae520762 SHA512 6e55e25ee2089b9ce4aac45097dc5cf3f8314393f3bdab160bb7e133701458491822517ec6fccbee05ce9a280234b8f2925b6dea5d82875b8c29e6677ac31958 WHIRLPOOL a3b9488c7567b0f516160abc9d5e43e0bf6008d6db66165f2a776273771f8839df4dbe5bfcb45d21be4590bff2abfe41b4c9e2509247c05041b3f0e78f1a4588
 DIST hardened-patches-2.6.32-186.extras.tar.bz2 986803 SHA256 4c9d5e00fec7d2e8ebe513a96c21dc16e8fdf511488ca0e58e647ce8e94634c4 SHA512 535f07edfba24701267b2a0d06522b7902ff4ec0ee4b845b4de313148e38a2ee95abd1abfc495a661beac09d8ddd56afbd0e2eab42f8d1b3234da1db740f99d0 WHIRLPOOL 7d6fcaf48131f5ee3bdf651de4210bf9aad24139fa82e05f4e445d63ed795c6b7c3e16d26d457b63577b123f13eab91ab265dc19e500460b799a740e193c933c
 DIST hardened-patches-2.6.32-190.extras.tar.bz2 985805 SHA256 02caae61ef095198a18343a2e7cfcf895cbe3197d6a495e952e839f950e8c9fc SHA512 8007733d486877e94d54fdb2c7a4ebf5c405cb0fcda98dd50f4b33704682d0bb2973c0f359641278efd1b5c401d25484dc7891d12465e3c3691a700c5a5144a4 WHIRLPOOL 2511c55844d35367b6228df5692c1d2a04742ba67ea96856cf281ba3c7046137a1f9f0726612f973060ee1c5d83baa31db6d3db114740a50015cbeb5ca3ccfdd
-DIST hardened-patches-2.6.32-193.extras.tar.bz2 992365 SHA256 2cd751e7efb8b0b453b04a70f5577fbc5f99fec2200ab454050f41e8e134e3c8 SHA512 eed14466e8e2b480312b79dd0327cf7cce74d649bbfc292d177f1fb387ca30810548b78391fc9106495523ec30f191fdf6a30afdd65ab545c836c03a85e419d9 WHIRLPOOL a077d08a9399025f68853075ea061a47b5058b7ece36f45605166c4e6530c76d99993cf9c99295095d7986dc663a22d4a01c1c3dc76d0dd48cddb6825db26217
 DIST hardened-patches-2.6.32-194.extras.tar.bz2 990161 SHA256 595ab80548a88d0d1644c9259aa5ac1ae1382dc766d62c740d8c82eb525ce1a8 SHA512 8aaf2198f7af3fa36552edcfb9003c3a2bad756f00106b80e1977748ecef61e07a6d0bab96ba902b7856e567419654a4bed4127a8fd7b31aceb719febe966081 WHIRLPOOL a00175f9fa2b05d5bc8b26f9a305b79e8662e7e5ddd45345e773ad77f98ca17163b5f41fc05c2c169246ec3edb0cb5a1e7e20365e853960c1e729b02b4cb61e2
-DIST hardened-patches-3.10.1-2.extras.tar.bz2 722434 SHA256 16c35d0b79f667833d6439760c4e494409ed171d8893dffcdc1515f504663682 SHA512 e33fe8d1ce0a1eb90a632054c4f5530f57c69a6c4b7cc2557e45293d7732fd49c9bcae69af9a67e26686255384cc1eeb463254e015066de4518c2421b59bf47d WHIRLPOOL 1b0e3c70a1755b20f9bedfc9f7e9e3788f1be5a5462ef487bbe54b562f3515b632ca40ccc05f7393445c7f4a83e067204a43853479b4ec7e36830975877d2ad5
 DIST hardened-patches-3.11.2-1.extras.tar.bz2 805489 SHA256 ad499bf570c9e078ee13a9dedfd95f0ba89acf8734833155974063e7f39f7df0 SHA512 53bf9b5218251914bd22856cfba4b40495b1622773b33e6b76d9c3e65bc6598bd57db21abc99f246161dd0ba92e15b5603657bdb3e4dac8fb590743acd8240ed WHIRLPOOL 988041bd4aa0f1608a97755fa5996c7f99323d0af26810a8d67c28e986d7b22a1634fd1aefad8f323b82ee66ea9cbcf2b48a72eafe80b728d1d39eda576f9c0d
 DIST hardened-patches-3.11.7-2.extras.tar.bz2 767238 SHA256 908678fe53c768ef564b4c47e00f0e22a7c7c16cc1ea0d931662d19fe6ca7cd8 SHA512 703f8c57931eeced09d3cf77525252b69cb369d8da40c16b8d4521a1b9657ce1075cc4138c5d1678e051575928fab292f59cf2b9638dc538f7d957e4a64dd418 WHIRLPOOL 315b1520631b06ba6ce6683fdbf6a7a3689f278844e2df37879069f2c1d0680c111a6783a4122d96a2d7d4824cdba4e9cf68dce44a1ea5adb1765b55fc67dd7a
-DIST hardened-patches-3.12.6-5.extras.tar.bz2 806015 SHA256 1f7a60bfa5885d90826ced15973cec480ae071b0633c8e01ac19ebc45ba0bd90 SHA512 573d66eaaa787576229597f73c9d7e1a56e467dae18ad0496d9aedc185393d67d42313be55973aff438c59f885cdb0c0fdeb0fa2facce4fd7a937fa108477fdb WHIRLPOOL 33c4bcfd18d8cb73abacd59c8975f8e240e1e7959fa2b58821a747f1a6ae8156f25ca39542082d528e0ed8a497c13001f823522bb9ab87201d64607997e7037b
-DIST hardened-patches-3.2.48-5.extras.tar.bz2 1462669 SHA256 cc1b3e73f94ad671f7d2b4647296f1d05dabc2216001b68cb0e956bd6cfe9081 SHA512 30f839057aae3cedd1e39f97736307d7721f03fb0ff8b47eb6b79c53b0eb2ca59908b85dd85f1ddcdddd3becf7fa7886341e1d802e21e2635ddc715cc7ea6b13 WHIRLPOOL bf2d8fa4c9492b59ca62da896a4a2e18ba3116c38168eeff5ea0b8c9139477c57712b6ce9dabb500d36e3d8c9878fa8fecfa4ad5e37d0a5446f2537539ae62c7
+DIST hardened-patches-3.12.8-1.extras.tar.bz2 805426 SHA256 d29fc91eeca6272a76a37bb5413c93a44fbc4b77eaf3825e25e84fb3ccb9b307 SHA512 4a1a605201de0b76e341876e0b3567e14d897ae1123cf4442c090e0ea48ec0ec74385a5a45437e4095838acd14920d2b17ccd78380ae678e87d08a7080d91541 WHIRLPOOL 7b8ff7057c64907f913fc7eb716e89d255ec14c013b019515420a37b033997b614a11ad5b8f0e5427750b0b1ce57541fe9edd778db4d80d0ba262de261b5c82e
 DIST hardened-patches-3.2.51-3.extras.tar.bz2 1553995 SHA256 2096f5ce3b2e468f0ab3181b3796e12f41f5876cb5752bdb8cfbb60ff520ad2a SHA512 76f593976f3fe0dbc6b8ce25ac0a409dc2e14d81951ce1692c9ff5bb8f7e0e8ac61702380dc8040c2d930ac9a8b2a1a3618f3ecd93afa9921effd84fb05e9da2 WHIRLPOOL beed166fa59325241e14f413b7d773413f9a4cbcf3fdc2bf9acea17cabb977f8a61db8db8986b69e6bdfa7fcd06223e0b8a3f84b42843977e1a5823fefe7339b
 DIST hardened-patches-3.2.52-4.extras.tar.bz2 1611059 SHA256 5ef1a38ebe24dc3794018412185ccc783071ea0c9af33e1c6db884187f1fceab SHA512 73ea5ac122a9d1fec35d65a9578201cdf3a6567e5562c7e43397022e3132c299e2bbe7182119c714957cdeccbbc7d9e11fc70569bac5a65663f1d477e205554a WHIRLPOOL 00e41fc02f0bd0d55455f153fdba243f623e4d01f4e5e2bdfe28e508213cd9ae048dd7b3569dd70498e6c3c8044b6a3001cf45ba6ed3bea591518d97c2d868b2
-DIST hardened-patches-3.2.53-6.extras.tar.bz2 1696117 SHA256 f95a67eef7e11997778e55e787b4210d12404e0ad1e4bd9fa9c11a2c739d949c SHA512 b4b88574108c8a36a900336791c65c2e5f5504729fce50b88affc401c2304f55974a428a55deb05a2e591078bbe14755e874bb38292df8858750657340d02a8f WHIRLPOOL 9b2905d4f36b460693b6475ecd3ed0b7ee70162844f3405af20eda30e4a8a4309fbd5ea016ef7b439142382e97c99038433be49953dc5762fcad61f0da9ac895
 DIST hardened-patches-3.2.53-7.extras.tar.bz2 1691171 SHA256 7dd9b8f06db46488c00b0d5fb1183e8702a11d94101fe9fc44a45afcb6c94803 SHA512 a4890882890c687ba12c3c9fe336301ff4ff9d0b30ddb2e769054e124be45fe2a01e3b6749e6d9e866223507b95eef827ef427cab0effc449af4d5f23890a0d5 WHIRLPOOL 3c45d4ad79146f53d80453f94ebdc30cc25ad4cf1efc49e0efaf9d7fd05e5fb5ae52a42c883503d0939fea6571eee068897fd7a97ea237f17f0e87750a5d44ae
-DIST hardened-patches-3.2.54-1.extras.tar.bz2 1742323 SHA256 ec8d63695b507129eaf953c8f0bd77be50e0548dae43406b393a7a700e245ef1 SHA512 44806e4fbf0cc3b427ab1670ad9657a499362f4bf952951ce565aa1af9f12c0f5d0082343d30f3ae238eaf7bd23e045fe7f822bcab2130f18202b2bfab96a7af WHIRLPOOL 45b2b88214798ecb586cfef6896c16970615ca7ea74bae45472f0b0ce4c3a73ee621557670a869b4dca0728bd7d64dfb4a690d8a8c0ddad19820dd7ee4aa9639
+DIST hardened-patches-3.2.54-3.extras.tar.bz2 1739175 SHA256 62549c37e4abbc62a0a7f35d44f31bd60cf6eba8b567676bf0ad23cd260db5de SHA512 66ee6ccc089971d668c97535975f33251471474efe9497b40612bc9d7d757f0bf1a60b72b23ccc6a56a2e11029abca76497fdd93a579c73dc77b2daea6ad8698 WHIRLPOOL 7dff320115b31c922eb2de724b97c4cd6fe6149c9ca94da3619a3e816470e6498d8595873a057ff8a4f0f4c3f9982dc943cce5092d9cdb8661360420e86a2c53
 DIST linux-2.6.32.tar.xz 52620720 SHA256 723106c298c5ba8733bb51ecc106b05e332a18490edc5f61cc6e57dbb36dcc46 SHA512 f8570daf2806eb191fce54cc7358577b0571bb295a75bd86db630d6136b328ae48e4732554b2d1886c64b0a0018bf0b9105dcface978a5005d1b77789aa40312 WHIRLPOOL bfcb4b186f7c4b60e69674a85d20a8e92b5efd05941b550401ef446cc6b20c9ed197f920d1cd9250c0e518c05308b9225f7ababe41cdfc83570412117b2ee555
-DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild
deleted file mode 100644
index f9c7e5e80ea7..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-183"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r188.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r188.ebuild
deleted file mode 100644
index 5c5c95c75566..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r188.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r188.ebuild,v 1.1 2013/12/26 19:32:48 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-193"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild
deleted file mode 100644
index a94f5e918b77..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	1510_af_key-fix-info-leaks-in-notify-messages.patch
-	1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.12.6-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.12.8.ebuild
similarity index 90%
rename from sys-kernel/hardened-sources/hardened-sources-3.12.6-r4.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.12.8.ebuild
index 8849f42c69cd..8821a297ffeb 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.12.6-r4.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.12.8.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.12.6-r4.ebuild,v 1.1 2014/01/04 19:04:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.12.8.ebuild,v 1.1 2014/01/19 14:16:13 blueness Exp $
 
 EAPI="5"
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
+K_GENPATCHES_VER="9"
 K_DEBLOB_AVAILABLE="1"
 
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild
deleted file mode 100644
index 0ae586dd0ac1..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.53-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.53-r5.ebuild
deleted file mode 100644
index 285ae9f37b6f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.53-r5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.53-r5.ebuild,v 1.1 2013/12/26 19:34:39 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.0*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.54.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.54-r2.ebuild
similarity index 91%
rename from sys-kernel/hardened-sources/hardened-sources-3.2.54.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.2.54-r2.ebuild
index 657975271f27..14f883564a81 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.54.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.54-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.54.ebuild,v 1.1 2014/01/06 22:47:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.54-r2.ebuild,v 1.1 2014/01/19 14:13:03 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
index dc21d1e7325e..7147bfda554b 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild,v 1.13 2013/09/06 18:32:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild,v 1.14 2014/01/19 20:11:39 vapier Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="python static-libs"
 
 RDEPEND="python? ( dev-lang/python )"
diff --git a/sys-libs/libcap/libcap-2.22-r1.ebuild b/sys-libs/libcap/libcap-2.22-r1.ebuild
index 602155b8ed44..762d05c523ac 100644
--- a/sys-libs/libcap/libcap-2.22-r1.ebuild
+++ b/sys-libs/libcap/libcap-2.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r1.ebuild,v 1.3 2013/11/28 20:41:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r1.ebuild,v 1.4 2014/01/19 10:18:06 vapier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="pam"
 
 RDEPEND="sys-apps/attr
diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild
index e1790ca23874..d41db02bb88a 100644
--- a/sys-libs/libcap/libcap-2.22-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.3 2013/12/03 19:45:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.4 2014/01/19 10:18:06 vapier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="pam"
 
 RDEPEND="sys-apps/attr[${MULTILIB_USEDEP}]
diff --git a/sys-libs/libcap/libcap-2.22.ebuild b/sys-libs/libcap/libcap-2.22.ebuild
index 079ee909db87..8610481c441c 100644
--- a/sys-libs/libcap/libcap-2.22.ebuild
+++ b/sys-libs/libcap/libcap-2.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.13 2013/11/28 20:41:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.14 2014/01/19 10:18:06 vapier Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 RDEPEND="sys-apps/attr
diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r1.ebuild
index b05e7c910d49..71ad4ca8e5da 100644
--- a/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.2_p5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.5 2014/01/18 02:22:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.6 2014/01/20 06:34:37 vapier Exp $
 
 EAPI="4"
 
@@ -42,7 +42,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r2[${MULTILIB_USEDEP}]
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-process/lsof/lsof-4.85-r2.ebuild b/sys-process/lsof/lsof-4.85-r2.ebuild
index c1351ac22a37..b91bb69d4d2c 100644
--- a/sys-process/lsof/lsof-4.85-r2.ebuild
+++ b/sys-process/lsof/lsof-4.85-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.11 2014/01/18 03:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.12 2014/01/20 06:40:56 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,8 @@ IUSE="examples ipv6 rpc selinux static"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	rpc? ( virtual/pkgconfig )"
 
 S=${WORKDIR}/${MY_P}/${MY_P}_src
 
@@ -44,7 +45,7 @@ target() { usex kernel_FreeBSD freebsd linux ; }
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
+	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
diff --git a/sys-process/lsof/lsof-4.87-r1.ebuild b/sys-process/lsof/lsof-4.87-r1.ebuild
index 19e4fc899c60..ea2502641beb 100644
--- a/sys-process/lsof/lsof-4.87-r1.ebuild
+++ b/sys-process/lsof/lsof-4.87-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.87-r1.ebuild,v 1.2 2014/01/18 03:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.87-r1.ebuild,v 1.3 2014/01/20 06:40:56 vapier Exp $
 
 EAPI="4"
 
@@ -20,7 +20,8 @@ IUSE="examples ipv6 rpc selinux static"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	rpc? ( virtual/pkgconfig )"
 
 S=${WORKDIR}/${MY_P}/${MY_P}_src
 
@@ -52,7 +53,7 @@ target() {
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
+	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
diff --git a/sys-process/numad/metadata.xml b/sys-process/numad/metadata.xml
index 44551a5a563c..6565d583883d 100644
--- a/sys-process/numad/metadata.xml
+++ b/sys-process/numad/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+  <herd>base-system</herd>
+  <maintainer>
+    <email>cardoe@gentoo.org</email>
+    <name>Doug Goldstein</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-process/numad/numad-0.5-r1.ebuild b/sys-process/numad/numad-0.5-r1.ebuild
new file mode 100644
index 000000000000..f91afeafaa41
--- /dev/null
+++ b/sys-process/numad/numad-0.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-0.5-r1.ebuild,v 1.1 2014/01/20 07:50:15 jlec Exp $
+
+EAPI=5
+
+inherit linux-info toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.fedorahosted.org/numad.git"
+	KEYWORDS="~amd64 -arm -s390 ~x86"
+else
+	SRC_URI="http://git.fedorahosted.org/git/?p=numad.git;a=snapshot;h=334278ff3d774d105939743436d7378a189e8693;sf=tbz2 -> numad-0.5-334278f.tar.bz2"
+	KEYWORDS="~amd64 -arm -s390 ~x86"
+	S="${WORKDIR}/${PN}-334278f"
+fi
+
+DESCRIPTION="The NUMA daemon that manages application locality"
+HOMEPAGE="http://fedoraproject.org/wiki/Features/numad"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="~NUMA ~CPUSETS"
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${FILESDIR}" \
+		epatch
+
+	tc-export CC
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -std=gnu99"
+}
+
+src_install() {
+	emake prefix="${ED}/usr" install
+}
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index 95c491bf6217..c80d2bb32736 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-9999.ebuild,v 1.2 2013/02/27 00:28:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numad/numad-9999.ebuild,v 1.3 2014/01/20 07:50:15 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit linux-info git-2
+inherit git-r3 linux-info toolchain-funcs
 
 if [[ ${PV} = "9999" ]]; then
 	inherit git-2
@@ -17,26 +17,28 @@ fi
 
 DESCRIPTION="The NUMA daemon that manages application locality"
 HOMEPAGE="http://fedoraproject.org/wiki/Features/numad"
-#SRC_URI=""
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 CONFIG_CHECK="~NUMA ~CPUSETS"
 
 src_prepare() {
 	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${FILESDIR}" \
 		epatch
+
+	tc-export CC
 }
 
 src_configure() {
 	:
 }
 
+src_compile() {
+	emake CFLAGS="${CFLAGS} -std=gnu99"
+}
+
 src_install() {
 	emake prefix="${ED}/usr" install
 }
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild
index 0c8868621898..aae4de264937 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild,v 1.13 2013/03/02 16:26:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.122.0.ebuild,v 1.14 2014/01/19 20:52:03 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild
index 8006bbea862f..1749977cb84c 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild,v 1.1 2013/09/05 03:45:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.123.0.ebuild,v 1.2 2014/01/19 20:52:03 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
index 833999adc818..5cce382723bb 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild,v 1.1 2013/10/28 06:19:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0.ebuild,v 1.2 2014/01/19 20:52:03 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild
index 6f95d0b7001a..366bc5673b54 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild,v 1.15 2014/01/17 05:51:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.8.0.ebuild,v 1.16 2014/01/19 21:00:09 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild
index a4b8871a59c7..dfa899fdc064 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild,v 1.14 2013/03/02 16:26:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.120.921.ebuild,v 1.15 2014/01/19 21:03:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild
index 7f6a6f3f2e7c..fd175b206cdf 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild,v 1.1 2013/08/14 07:28:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.140.ebuild,v 1.2 2014/01/19 21:03:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild
index ad20d0600e43..4b7e78a45e13 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild,v 1.1 2013/09/09 05:18:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.132.510.ebuild,v 1.2 2014/01/19 21:03:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild
index bdc600d50164..43602e6e9192 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild,v 1.8 2013/04/20 16:59:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r3.ebuild,v 1.9 2014/01/19 20:34:13 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
index 4d51f540db46..9686db692796 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild,v 1.1 2013/09/06 02:55:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild,v 1.2 2014/01/19 20:34:13 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild
index f1504fb612cc..a90921bc1d45 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild,v 1.1 2013/09/18 02:44:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0.ebuild,v 1.2 2014/01/19 20:34:13 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild
index 45674a1b97aa..9cb2c1a90822 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild,v 1.7 2013/12/01 14:44:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r2.ebuild,v 1.8 2014/01/19 08:59:24 pacho Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild
index 1b0fb9a168bb..09bd4711c57e 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild,v 1.15 2013/12/14 18:21:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.540.0.ebuild,v 1.16 2014/01/19 21:09:22 vapier Exp $
 
 DESCRIPTION="Virtual for ExtUtils-Install"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild
index fd1d7d85f0af..e322cf413f6e 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild,v 1.14 2013/04/20 17:01:08 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.640.0.ebuild,v 1.15 2014/01/19 21:09:28 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild
index cf8c75ce8e50..a54ea45b1571 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild,v 1.1 2013/08/14 06:55:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.720.0.ebuild,v 1.2 2014/01/19 21:09:28 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild
index 013161ec1b08..19dba5f194d1 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild,v 1.1 2013/09/05 04:02:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.740.0.ebuild,v 1.2 2014/01/19 21:09:28 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild
index adb6dbdfd8f8..5a4c9052e3bc 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild,v 1.1 2013/11/25 12:05:45 civil Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.820.0.ebuild,v 1.2 2014/01/19 21:09:28 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild
index 271649f2997f..5a25722ab011 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild,v 1.14 2013/04/20 17:00:18 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.610.0.ebuild,v 1.15 2014/01/19 21:09:18 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild
index e8198babc0ad..9c6d5adc9713 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild,v 1.2 2013/09/09 15:13:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.630.0.ebuild,v 1.3 2014/01/19 21:09:18 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild
index 6a3cb5a5f076..b88d87463fb5 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild,v 1.14 2014/01/17 05:54:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.400.0.ebuild,v 1.15 2014/01/19 20:30:51 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild
index 9efb820f7055..7d6aec07af2b 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild,v 1.4 2014/01/17 05:55:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.220.0-r2.ebuild,v 1.5 2014/01/19 21:02:46 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild
index a5c199761aca..d29090e458ef 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild,v 1.2 2013/09/05 06:43:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.100.ebuild,v 1.3 2014/01/19 21:02:46 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild
index 6d05a986ae8c..6e2ea3310830 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild,v 1.1 2013/10/28 06:27:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.400.ebuild,v 1.2 2014/01/19 21:02:46 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-IO/perl-IO-1.25.ebuild b/virtual/perl-IO/perl-IO-1.25.ebuild
index 249172cc9e46..2238ba4d736c 100644
--- a/virtual/perl-IO/perl-IO-1.25.ebuild
+++ b/virtual/perl-IO/perl-IO-1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.25.ebuild,v 1.22 2013/12/31 20:24:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.25.ebuild,v 1.23 2014/01/19 21:05:45 vapier Exp $
 
 DESCRIPTION="Virtual for IO"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-IO/perl-IO-1.280.0.ebuild b/virtual/perl-IO/perl-IO-1.280.0.ebuild
index f684262918c8..cba1493cc24f 100644
--- a/virtual/perl-IO/perl-IO-1.280.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.280.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.280.0.ebuild,v 1.1 2013/08/14 05:49:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.280.0.ebuild,v 1.2 2014/01/19 21:05:45 vapier Exp $
 
 DESCRIPTION="Virtual for IO"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild
index 3cf42520ccd1..26785bf9e0d7 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild,v 1.2 2013/02/18 23:21:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.0-r1.ebuild,v 1.3 2014/01/19 20:53:57 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild
index 3c5cc6645ab5..04483847cda0 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild,v 1.1 2013/03/13 08:17:57 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.20.ebuild,v 1.2 2014/01/19 20:53:57 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild
index a615507e049a..3d87cf53d440 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild,v 1.14 2013/03/02 16:35:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.400.ebuild,v 1.15 2014/01/19 21:01:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild
index b8c61efdef87..268af566037f 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild,v 1.1 2013/08/14 08:25:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.500.ebuild,v 1.2 2014/01/19 21:01:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild
index 6e0ec9be05ec..5fe6beb7e3c1 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild,v 1.1 2013/09/13 04:47:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.700.ebuild,v 1.2 2014/01/19 21:01:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild
index 60dfa0b533ce..c9a0600c784f 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild,v 1.1 2013/10/28 06:01:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.440.900.ebuild,v 1.2 2014/01/19 21:01:49 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild
index 5cff1f1512dd..d02d249a671e 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild,v 1.14 2014/01/17 05:58:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.270.0.ebuild,v 1.15 2014/01/19 20:49:01 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild
index 45974a80f3bd..4723f91507b5 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild,v 1.1 2013/08/14 07:46:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.300.0.ebuild,v 1.2 2014/01/19 20:49:01 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild
index f39e7c11e1b1..85438d57b352 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild,v 1.1 2013/08/24 03:57:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.310.0.ebuild,v 1.2 2014/01/19 20:49:01 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild
index 10d79d1fe4af..95b4ef0cda4e 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild,v 1.1 2013/09/05 03:38:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.320.0.ebuild,v 1.2 2014/01/19 20:49:01 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild
index 947beaf8b8e9..bcd098eb7c49 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild,v 1.1 2013/10/28 06:23:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.350.0.ebuild,v 1.2 2014/01/19 20:49:01 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Socket/perl-Socket-2.9.0.ebuild b/virtual/perl-Socket/perl-Socket-2.9.0.ebuild
index c45bd852f064..2dcf97776186 100644
--- a/virtual/perl-Socket/perl-Socket-2.9.0.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Socket/perl-Socket-2.9.0.ebuild,v 1.3 2013/12/01 14:43:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Socket/perl-Socket-2.9.0.ebuild,v 1.4 2014/01/19 09:00:28 pacho Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild
index 7d444fd24ccd..9bdd4b3ad4f9 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild,v 1.7 2013/02/18 23:23:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r2.ebuild,v 1.8 2014/01/19 21:07:20 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild
index aa78e98933de..4490bc218679 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild,v 1.2 2013/09/05 06:53:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r3.ebuild,v 1.3 2014/01/19 21:07:20 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-version/perl-version-0.990.100.ebuild b/virtual/perl-version/perl-version-0.990.100.ebuild
index d4675831b822..41ea02b24296 100644
--- a/virtual/perl-version/perl-version-0.990.100.ebuild
+++ b/virtual/perl-version/perl-version-0.990.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.100.ebuild,v 1.14 2014/01/17 06:04:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.100.ebuild,v 1.15 2014/01/19 20:51:23 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-version/perl-version-0.990.200.ebuild b/virtual/perl-version/perl-version-0.990.200.ebuild
index 6f2a6605e9a3..4a96badb2d7e 100644
--- a/virtual/perl-version/perl-version-0.990.200.ebuild
+++ b/virtual/perl-version/perl-version-0.990.200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.200.ebuild,v 1.1 2013/03/13 07:39:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.200.ebuild,v 1.2 2014/01/19 20:51:23 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-version/perl-version-0.990.300.ebuild b/virtual/perl-version/perl-version-0.990.300.ebuild
index 9dd66234df90..20960e5fd3c0 100644
--- a/virtual/perl-version/perl-version-0.990.300.ebuild
+++ b/virtual/perl-version/perl-version-0.990.300.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.300.ebuild,v 1.1 2013/08/24 03:47:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.300.ebuild,v 1.2 2014/01/19 20:51:23 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-version/perl-version-0.990.400.ebuild b/virtual/perl-version/perl-version-0.990.400.ebuild
index f79d7acc9ce9..3d77023e06ca 100644
--- a/virtual/perl-version/perl-version-0.990.400.ebuild
+++ b/virtual/perl-version/perl-version-0.990.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.400.ebuild,v 1.1 2013/09/18 02:50:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.400.ebuild,v 1.2 2014/01/19 20:51:23 vapier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
index 776263ed913a..b271dc86a0e2 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.5 2013/10/14 14:21:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libGLw/libGLw-8.0.0.ebuild,v 1.6 2014/01/20 08:49:44 zlogene 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 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+motif static-libs"
 
 RDEPEND="
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild
index 324deeab93aa..bc3f0141f5e8 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild,v 1.3 2013/12/31 08:52:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xfce4-terminal/xfce4-terminal-0.6.2-r1.ebuild,v 1.4 2014/01/19 18:59:59 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.26
diff --git a/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
index 485ec7e12399..50c02fa65afe 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.2 2014/01/05 11:09:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve/qtcurve-1.8.17-r1.ebuild,v 1.3 2014/01/20 09:18:05 yngwin Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
@@ -34,7 +34,8 @@ RDEPEND="X? ( x11-libs/libxcb
 		dev-qt/qtgui:4
 		dev-qt/qtsvg:4
 	)
-	qt5? ( dev-qt/qtgui:5
+	qt5? ( dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		X? ( dev-qt/qtdbus:5
@@ -49,7 +50,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
-
 PATCHES=( "${DISTDIR}/${P}-old_config_file.patch" )
 
 pkg_setup() {
diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
index 2f9df00a29a1..b7c87f0c11fa 100644
--- a/x11-wm/openbox/openbox-3.5.2-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.2-r1.ebuild,v 1.8 2014/01/18 20:03:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.2-r1.ebuild,v 1.9 2014/01/19 10:15:51 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
 	branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha amd64 arm hppa ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
new file mode 100644
index 000000000000..edd42a8e837b
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
@@ -0,0 +1,10 @@
+--- src/xpra/client/gtk_base/client_launcher.py
++++ src/xpra/client/gtk_base/client_launcher.py
+@@ -18,5 +18,6 @@
+ import pygtk
+ pygtk.require('2.0')
+-import gtk.gdk
++import gtk
++from gtk import gdk
+ import gobject
+ gobject.threads_init()
diff --git a/x11-wm/xpra/xpra-0.10.12.ebuild b/x11-wm/xpra/xpra-0.10.12-r1.ebuild
similarity index 92%
rename from x11-wm/xpra/xpra-0.10.12.ebuild
rename to x11-wm/xpra/xpra-0.10.12-r1.ebuild
index e35ffd257c80..ee1b052f9d02 100644
--- a/x11-wm/xpra/xpra-0.10.12.ebuild
+++ b/x11-wm/xpra/xpra-0.10.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12.ebuild,v 1.1 2014/01/14 15:46:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12-r1.ebuild,v 1.1 2014/01/19 22:01:35 xmw Exp $
 
 EAPI=5
 
@@ -63,7 +63,8 @@ DEPEND="${COMMON_DEPEND}
 python_prepare_all() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.10.1-prefix.patch
+		"${FILESDIR}"/${PN}-0.10.1-prefix.patch \
+		"${FILESDIR}"/${PN}-0.10.12-launcher.patch
 
 	#assuming ffmpeg and libav mutual exclusive installs
 	if has_version "media-video/libav" ; then
@@ -71,6 +72,8 @@ python_prepare_all() {
 			epatch patches/old-libav.patch
 		fi
 	fi
+
+	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
diff --git a/xfce-base/garcon/garcon-0.2.1.ebuild b/xfce-base/garcon/garcon-0.2.1.ebuild
index e9c7fd147c08..6507f3f5b781 100644
--- a/xfce-base/garcon/garcon-0.2.1.ebuild
+++ b/xfce-base/garcon/garcon-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/garcon/garcon-0.2.1.ebuild,v 1.3 2013/12/31 08:49:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/garcon/garcon-0.2.1.ebuild,v 1.4 2014/01/19 18:56:30 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/libs/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.14
diff --git a/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild
index 84ac9a6470c9..b8c34e2eae91 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild,v 1.3 2013/12/31 08:48:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.10.1.ebuild,v 1.4 2014/01/19 18:56:54 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.24"
diff --git a/xfce-base/thunar/thunar-1.6.3.ebuild b/xfce-base/thunar/thunar-1.6.3.ebuild
index a4767cae62e6..92c3930ea661 100644
--- a/xfce-base/thunar/thunar-1.6.3.ebuild
+++ b/xfce-base/thunar/thunar-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.6.3.ebuild,v 1.2 2013/12/31 08:49:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.6.3.ebuild,v 1.3 2014/01/19 18:57:21 pacho Exp $
 
 EAPI=5
 inherit virtualx xfconf
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.10.1"
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild
index df0d0dff2f1e..a1eff426f957 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild,v 1.3 2013/12/31 08:50:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-appfinder/xfce4-appfinder-4.10.1.ebuild,v 1.4 2014/01/19 18:57:45 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild
index 3b74f80ec6bf..eaafd12e5205 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild,v 1.3 2013/12/31 08:50:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.10.1.ebuild,v 1.4 2014/01/19 18:58:15 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild
index efaaa095d612..785eebff482c 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild,v 1.4 2013/12/31 08:50:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1.ebuild,v 1.5 2014/01/19 18:58:43 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug systemd udev +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
index 13f07723def1..875a433a3fd0 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.3 2013/12/31 08:51:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.4 2014/01/19 18:59:08 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug libcanberra libnotify +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-base/xfwm4/xfwm4-4.10.1.ebuild b/xfce-base/xfwm4/xfwm4-4.10.1.ebuild
index cd29ecbb39b6..34e4fa6bb061 100644
--- a/xfce-base/xfwm4/xfwm4-4.10.1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.10.1.ebuild,v 1.3 2013/12/31 08:51:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.10.1.ebuild,v 1.4 2014/01/19 18:59:34 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug startup-notification +xcomposite"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild
index bc6201c7adda..ccb41281fce3 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild,v 1.2 2013/12/31 08:52:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1.ebuild,v 1.3 2014/01/19 19:00:53 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/libxfce4util-4.8
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
index 120211b935b8..4a405b66979f 100644
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild,v 1.1 2013/05/11 12:12:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild,v 1.2 2014/01/19 19:01:09 pacho Exp $
 
 EAPI=5
 EAUTORECONF=yes
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 IUSE="debug"
 
 RDEPEND=">=media-libs/taglib-1.6
diff --git a/xfce-extra/tumbler/tumbler-0.1.29.ebuild b/xfce-extra/tumbler/tumbler-0.1.29.ebuild
index c662c14413cf..e10535968d64 100644
--- a/xfce-extra/tumbler/tumbler-0.1.29.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.1.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/tumbler-0.1.29.ebuild,v 1.4 2013/12/31 08:53:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/tumbler-0.1.29.ebuild,v 1.5 2014/01/19 19:01:35 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="curl debug ffmpeg gstreamer jpeg odf pdf raw"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild
index 036db4de3a1d..928df7603153 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild,v 1.1 2013/09/03 15:07:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.0.ebuild,v 1.2 2014/01/19 19:01:56 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild
index a2eeffb9b471..ad0212983f20 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild,v 1.1 2013/06/01 14:11:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.0.ebuild,v 1.2 2014/01/19 19:02:11 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild
index b4bf8a0314b9..6479ecc33d27 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild,v 1.1 2013/10/09 17:48:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.3.ebuild,v 1.2 2014/01/19 19:02:27 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="http://www.e-quake.org/wp-uploads/2013/09/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
index 15f55ac288b1..b97385f9ecb6 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild,v 1.2 2013/12/31 08:53:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild,v 1.3 2014/01/19 19:02:52 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug ipv6 ssl"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild
index df3e768d8bf2..967a837fd805 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild,v 1.2 2013/12/31 08:54:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.0-r1.ebuild,v 1.3 2014/01/19 19:03:16 pacho Exp $
 
 EAPI=5
 inherit multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.10
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
index c4f08a840b05..7e55f6af3356 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild,v 1.2 2013/12/29 17:18:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild,v 1.3 2014/01/19 19:03:32 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild
index fadc7a1026d3..a93e2919f0a5 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild,v 1.2 2013/12/31 08:54:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.6.0.ebuild,v 1.3 2014/01/19 19:03:56 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug libnotify"
 
 RDEPEND=">=dev-libs/glib-2.28
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
index a9d97fe2435b..8c01ce5b5ecb 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild,v 1.2 2013/12/01 19:10:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r2.ebuild,v 1.3 2014/01/19 19:04:17 pacho Exp $
 
 EAPI=5
 inherit flag-o-matic linux-info xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild
index 784e214c5870..52b91f188351 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild,v 1.3 2013/12/31 08:54:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0-r1.ebuild,v 1.4 2014/01/19 19:04:44 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="x11-libs/cairo
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild
index 442d285f6efe..1e4e8037e954 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild,v 1.3 2013/12/31 08:55:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.5.0.ebuild,v 1.4 2014/01/19 19:05:09 pacho Exp $
 
 EAPI=5
 inherit multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
index d7056804ed6a..6a2ddf1d5aa7 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild,v 1.1 2013/06/04 21:03:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild,v 1.2 2014/01/19 19:06:22 pacho Exp $
 
 EAPI=5
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 327b28fb7e17..991ff5be809e 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-whiskermenu-plugin-1.1.1-src.tar.bz2 91002 SHA256 cfb86e9604c58a4657149950bfb693600a364ce4d64e4100c72bda489385dead SHA512 5b98398b7886f1cbf5f3239dab1090eb7739c1e4a85902ab92257a87c74f1967db34154e03c4d6a0e261672b6c58ad4ab10d4729d925c32214389724aa39d56d WHIRLPOOL c6a7adaa1ace131643942acf472b797943c7aedb31c015fec9ce97db758dcf6464fc9ac2b49217e2a9b455891ec8b836ac8445849ba79b40252baf972a1566a7
 DIST xfce4-whiskermenu-plugin-1.2.2-src.tar.bz2 108725 SHA256 452f16ffee61bef1b0e2583ba2445536bf2d4bd58627ff68b112f920c6aedf8c SHA512 f54936b605e034ddb6cad4bc6a1550c62aa44643f38508f94ed3ea22fbed032ba09295f02a5269a8f60006f7143980f634498eb48c6f7e7d758ec85bcd8e86d6 WHIRLPOOL ead10db62b9a336ab211e5077891ea33c38a1f509bf32e276d8584ee7feb772ad62a894e787006ea41d74fe73bee846b445d7a5e4063f220da2fb3ac1d74281d
-DIST xfce4-whiskermenu-plugin-1.3.0-src.tar.bz2 126644 SHA256 b02b4b3dc2f3966e3e55ad007a831615cd6e64c2fe7157d5b6116fa75c68681a SHA512 eef2e35ad353dcff4cbaf85380a0ca17924b3a7431c86d81d9ec8d971c7b532aae8ba9107388417a890da029b975e243845e0db79ad4e9dce05e7fb0fa046c0f WHIRLPOOL b0b5e64bc86e7e5351728f3a60086e1d44ef74fda8769f5d814bd8d348739a945010b680c7dfcaeded20ff0c88b86975016c593f690c63abf717d656f275d0bc
 DIST xfce4-whiskermenu-plugin-1.3.1-src.tar.bz2 127791 SHA256 f393ddf8015061d26fbef72c1a99ff59752c65ae5a12ec62bb2b3ee7ddbd687c SHA512 882eb2f7b77f18954a581f4130a90c92f4cc3c7f1150a300cce121702dcf977148351ac1d4988150c6ab7b14f58b40cbf7e27ccb0b20e5f189add997536bb6ac WHIRLPOOL cfd1942e87fece5a5af5030a9adb8cd930dd49ad07d06085c37a9d9631872236293eb20c3665e871123cec18950cdc6858cb88fc2dcc5e6f6d97bd54ce737e8f
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.3.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.3.0.ebuild
deleted file mode 100644
index 5414998e9ee7..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.3.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.3.0.ebuild,v 1.3 2014/01/04 14:33:14 hasufell Exp $
-
-EAPI=5
-
-inherit gnome2-utils cmake-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="http://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="http://gottcode.org/xfce4-whiskermenu-plugin/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	xfce-base/exo
-	xfce-base/garcon
-	xfce-base/libxfce4ui
-	xfce-base/libxfce4util
-	xfce-base/xfce4-panel
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	local i
-	cd po || die
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in *.po ; do
-			einfo "removing ${i%.po} linguas"
-			has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
index be403e4b4816..cb8dd64cdc58 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild,v 1.1 2013/12/11 15:10:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild,v 1.2 2014/01/19 19:05:41 pacho Exp $
 
 EAPI=5
 EAUTORECONF=1
@@ -12,7 +12,7 @@ SRC_URI="http://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild
index ea3b679ee5f0..2b4aefe7c713 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild,v 1.1 2013/06/20 18:12:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.6.ebuild,v 1.2 2014/01/19 19:06:06 pacho Exp $
 
 EAPI=5
 inherit multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=gnome-base/librsvg-2.36.2