diff --git a/app-admin/sshguard/sshguard-1.7.0.ebuild b/app-admin/sshguard/sshguard-1.7.0.ebuild
index aeed93f04f28..9196fdf4b631 100644
--- a/app-admin/sshguard/sshguard-1.7.0.ebuild
+++ b/app-admin/sshguard/sshguard-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 IUSE="ipfilter kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-arch/unrar/unrar-5.4.5.ebuild b/app-arch/unrar/unrar-5.4.5.ebuild
index 20247973120d..4b23b9998020 100644
--- a/app-arch/unrar/unrar-5.4.5.ebuild
+++ b/app-arch/unrar/unrar-5.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="unRAR"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-crypt/ccid/ccid-1.4.24.ebuild b/app-crypt/ccid/ccid-1.4.24.ebuild
index caa81254f4ba..4b5d46054acf 100644
--- a/app-crypt/ccid/ccid-1.4.24.ebuild
+++ b/app-crypt/ccid/ccid-1.4.24.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-editors/gvim/gvim-8.0.0106.ebuild b/app-editors/gvim/gvim-8.0.0106.ebuild
index f2918010a186..b5dcfe5b2920 100644
--- a/app-editors/gvim/gvim-8.0.0106.ebuild
+++ b/app-editors/gvim/gvim-8.0.0106.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/vim-core/vim-core-8.0.0106.ebuild b/app-editors/vim-core/vim-core-8.0.0106.ebuild
index 6a50bf3065eb..2a9d57d4b2fa 100644
--- a/app-editors/vim-core/vim-core-8.0.0106.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.0106.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/vim-8.0.0106.ebuild b/app-editors/vim/vim-8.0.0106.ebuild
index 3434c9460769..6467bcb9dbab 100644
--- a/app-editors/vim/vim-8.0.0106.ebuild
+++ b/app-editors/vim/vim-8.0.0106.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 8c7637aa5904..80e13a9dc919 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,3 +2,4 @@ DIST containerd-0.2.0.tar.gz 635248 SHA256 1462e0c233763800b91ac2a670d82994ba198
 DIST containerd-0.2.2.tar.gz 635882 SHA256 a21efc7ea4bb97306ae9807caadca6782358679f38d3afd606cb599b6853bc52 SHA512 db6111984ccce01e928d46f0a22aaeed8d0eb50c2578df4e0cd5f56f43f8bdea43aad3203c2afb743ccf82908bd5961792681eafe07818a4057ca5f5f31c5396 WHIRLPOOL ce80bf79970faeacc3329cb4e365973a88539508904003da3d0f32afce9966e89bdf13a8894657e1fd983392cf2ab88b053393cbbc2018f509d9cbc57ab835cc
 DIST containerd-0.2.3.tar.gz 997239 SHA256 247c459179b451cb235354d3f23876ad1a326a6bda430608f9306beeb0364287 SHA512 f850ea7558a3c772930d42352d7913ec00ec24536676720f8872153ec87b92785259645648d885bb5b27514ca01de7f207a931665c3074e787d8b74b48c51952 WHIRLPOOL ac5f5f38ce874146571017bb5ac0229af43782ccf7eb378c6c39ecfb4725cf6941a12a1b05b9a6840a75c85599a881d429eaea030148356a36d2b401874e01e4
 DIST containerd-0.2.4.tar.gz 1002344 SHA256 34805aef6300fbf37adcf4362a2315fac1ea57a9ceb8b0c7b1a0859cba975428 SHA512 f35d8d31cc76c1bf3dcbe25178868ce64624e6032756813e13222816155c10941abdaf7ba0558297f87557336a6e3d07eda06dbfd1099ee8de328f1ecc93c413 WHIRLPOOL 1f3c4b2f5a9e0d2265ec2d4162ff1a4b609ba28d3a94794e1a73129c070a240fd6ee9a3c2cfdcd76ff2fe378a7549b390cacb34e2ed7915fa5a304bb84b397c7
+DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4
diff --git a/app-emulation/containerd/containerd-0.2.5.ebuild b/app-emulation/containerd/containerd-0.2.5.ebuild
new file mode 100644
index 000000000000..ab4ce7e80243
--- /dev/null
+++ b/app-emulation/containerd/containerd-0.2.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+EGO_PN="github.com/docker/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened +seccomp"
+
+DEPEND=""
+RDEPEND=">=app-emulation/runc-1.0.0_rc2
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_compile() {
+	local options=( $(usex seccomp "seccomp") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd* bin/ctr
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 987dbb36f3e3..e0500d9a46f8 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1,3 @@
 DIST diskimage-builder-1.23.0.tar.gz 255659 SHA256 c235f459f4a52bf0cff134bb6921d29cdf7b87a4427d070e97e16c4b486fb66d SHA512 18d420759df167762c8b41249c94243081ffcf5312727dfc882964c9957752acadd6c526ef34fc49dcf9539b15852542f51f0d83630d27d67fc1c82efa144708 WHIRLPOOL bdd5ce22ae37f96420d9faae40a3cbcfa0d89ff1698f911759b2d79bfb7f867bee4fd0d827a14c1d825969c2bac6996d108cf9427fac5615de7c3527c268c8ee
 DIST diskimage-builder-1.24.0.tar.gz 256522 SHA256 e5236e0be1d07e0111bceae344bfe6f9dd8b0ed9eba64240e218ecc70b9a7b03 SHA512 27e99142e3d951c2137bf53b16298cc9aacfb5167e9fb4572e735e36b555628262c730570b177ea65565f27afce76c0fb8fdee97c9aa7a2346dfdbae1909fd30 WHIRLPOOL 95f77d78b2d723ec9bdcff190d6e583a0ea6963104126ca146221cf53974137d675e795133659dcd55477645cc2c7c7e8734acd8029f903e98130efd196f16a8
-DIST diskimage-builder-1.25.0.tar.gz 260339 SHA256 8cafc16394676303884825d27620e24a8af779b291154cdf0d2860658f13640e SHA512 b96deba8c3f971fb2b659aba812da74e53b19daee12ba1e199cd02cba442789446cad733810a72f2b81ab393de33869e035731cbfb8282d700f3fdace312f30d WHIRLPOOL 59882ffaadecf07d275e61a46d00b4257f2380efc6a269aa950ef8bc6d5e099647a1c9f8b24520e6765c668284a3aaeab761a606311c7c87b838d17500b4945e
+DIST diskimage-builder-1.25.1.tar.gz 259477 SHA256 72364780a1b8b75e7d82177d045c8d3c22d1b5d8c72fd61783e47a7b5c3217c6 SHA512 493d3aa3d5991794d9fd6c04cfc0fe5f69b62bca28aee904558f4fe061aa2764c716c3e31feae2a932e2c3473b8d926fb948916a5267091dc3e88bb257c84a75 WHIRLPOOL f1f542d0369242131f5eb8908182c38f098c75fc7b91bc95a12eb222d0432e9c35cfca59a16b738e7b43368bc464975c0358d25c0f47b7c90b676280327ef796
diff --git a/app-emulation/diskimage-builder/diskimage-builder-1.25.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.25.1.ebuild
similarity index 100%
rename from app-emulation/diskimage-builder/diskimage-builder-1.25.0.ebuild
rename to app-emulation/diskimage-builder/diskimage-builder-1.25.1.ebuild
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index 1f290babd919..a7552a7e503e 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,2 +1,3 @@
 DIST dateutils-0.3.5.tar.xz 593112 SHA256 cff341d3e6394627d98cb9643b9ca1235b839037ede58983c927df4f27ee31a7 SHA512 e0d732ce42551906da0c6635ac9e17aa4b12cb199e63f32355a33ded36afa2a37e05853c23716982daf6078be8b8dafb0d7c49a228876cbbafc4541c037e067a WHIRLPOOL 4d50e485362813dc77f18c43c3071d69654ab31372852da35af612a465a0cf108a7ad7c5ba3d0a021923a02622acf6502f47668d7226498064ed6855f21de26b
 DIST dateutils-0.4.0.tar.xz 608364 SHA256 d05af02bc60a82bdc21c0ac4779f1040f631b0a1233ed15c4f69a80d3dad23da SHA512 06aeed8cc2e8bd22584d74fccd6a9739fbed191a01d5dfb5bab48d5b059dce01d48f8b5f4b6e927e26c1ac2143d7aeed1f20f0415d1275d172f2584ef9d776a9 WHIRLPOOL 7341e9b0b7fb5d0126355141934825880c9c7c85344e797ca712aab150b7cd74e2d4cc0586344ef8f1451f08213549c9770e815af7476f3ddfebd299cc45fbef
+DIST dateutils-0.4.1.tar.xz 611460 SHA256 6ccce48975fc4d3af2e27c7893e181c46ab5df1cb37e4a428b4b521a77d55278 SHA512 c13461de6dad483b0014692a2319a7bf9ed1677415b8ee168131b397086f75725eb8b4e833d8b4a22f4aa726d6aca74be2597c2e07ef75a036cfea9bf67ccf1b WHIRLPOOL 2b6770306363f2653b0ddbdb12badc19927179dab707f5460c48f3219b96a475b5a0b6d451de5bba0f6567c7d348c40a6a2fdcf2afecc1e42034c832f7bc0177
diff --git a/app-misc/dateutils/dateutils-0.4.1.ebuild b/app-misc/dateutils/dateutils-0.4.1.ebuild
new file mode 100644
index 000000000000..aea356926abe
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-fabric/dapl"
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	# parallel tests failure
+	emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-misc/tmux/tmux-2.2.ebuild b/app-misc/tmux/tmux-2.2.ebuild
index af79163453e4..67a3f24a6b04 100644
--- a/app-misc/tmux/tmux-2.2.ebuild
+++ b/app-misc/tmux/tmux-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index c1c939b1097c..af8cecf4d5a4 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,2 +1 @@
 DIST workrave-1.10.15.tar.gz 6375380 SHA256 fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c SHA512 e741f5d0748ffaba9c8e69bcbd67f7b371424423ec8cea81d082462e8c33751c3e322301ae0749037668dc53cab28b19ec2b162f98eb7afbbd5ab85bae33cf7e WHIRLPOOL 02c9f25f06ae0753f7edc418ade789c82bf39736b975e755265a86b2677842098efc966530cf9063401e2e63d9f1670e4fd4ba5d9b635d05faa5cc71b9146afa
-DIST workrave-1.10.8.tar.gz 6370506 SHA256 15e0c87c2172dc249031d97d4020ee4a47ea9073aa26dc06a4b15e91abf88479 SHA512 67c3725627b42c5b32a61eb4e62e45b4a802806217ddb311ee2b610d281f9c521f69cc4da0db5ded63c99691d9f5c272493a911ba504f335508ac64945cd7403 WHIRLPOOL 9fe2c6dbd2abacc76190dac94ed334bb8ecad1dfb714afa6fee69cbbeae3981f960113dce52b54fb6935bacb29d7ad3939b4aba6ef6323b93d05b56b166edb7e
diff --git a/app-misc/workrave/workrave-1.10.15.ebuild b/app-misc/workrave/workrave-1.10.15.ebuild
index e940a699d98c..4438ba9f2943 100644
--- a/app-misc/workrave/workrave-1.10.15.ebuild
+++ b/app-misc/workrave/workrave-1.10.15.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="ayatana? ( introspection )"
 
 RDEPEND="
 	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
+	>=x11-libs/gtk+-3.0:3[introspection?,X]
 	>=dev-cpp/gtkmm-3.0.0:3.0
 	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/libsigc++-2.2.4.2:2
diff --git a/app-misc/workrave/workrave-1.10.8.ebuild b/app-misc/workrave/workrave-1.10.8.ebuild
deleted file mode 100644
index 018a0439f192..000000000000
--- a/app-misc/workrave/workrave-1.10.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no" # --enable-debug only messes up with FLAGS
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 versionator vcs-snapshot
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://www.workrave.org/"
-MY_PV=$(replace_all_version_separators '_')
-SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-# dbus support looks to be used only for trying to use panel applets on gnome3!
-IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
-REQUIRED_USE="ayatana? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	>=dev-cpp/gtkmm-3.0.0:3.0
-	>=dev-cpp/glibmm-2.28.0:2
-	>=dev-libs/libsigc++-2.2.4.2:2
-	ayatana? (
-		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
-		>=dev-libs/libindicator-0.4:3 )
-	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0[introspection?]
-		media-libs/gst-plugins-base:1.0[introspection?]
-		media-plugins/gst-plugins-meta:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mate? ( mate-base/mate-applets )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	xfce? (
-		>=x11-libs/gtk+-2.6.0:2[introspection?]
-		>=xfce-base/xfce4-panel-4.4 )
-	x11-libs/libXScrnSaver
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu
-"
-#        dbus? (
-#                >=sys-apps/dbus-1.2
-#                dev-libs/dbus-glib )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
-	dev-python/cheetah
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-utils
-		app-text/xmlto )
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# Fix gstreamer slot automagic dependency, bug #563584
-	# http://issues.workrave.org/show_bug.cgi?id=1179
-	epatch "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# gnet ("distribution") is dead for ages and other distributions stopped
-	# relying on it for such time too.
-	gnome2_src_configure \
-		--disable-dbus \
-		--disable-distribution \
-		--enable-exercises \
-		--disable-experimental \
-		--disable-gnome2 \
-		--disable-static \
-		--disable-xml \
-		$(use_enable ayatana indicator) \
-		$(use_enable doc manual) \
-		$(use_enable gnome gnome3) \
-		$(use_enable gstreamer) \
-		$(use_enable introspection) \
-		$(use_enable mate) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable test tests) \
-		$(use_enable xfce)
-}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 04897e84421c..148c8fb61867 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -166,3 +166,171 @@ DIST LibreOffice_5.2.3.3_Linux_x86_rpm_langpack_xh.tar.gz 490072 SHA256 4d344a71
 DIST LibreOffice_5.2.3.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 562758 SHA256 8feef8b3cc4d2f607d0d8ddc93dde70a271f0594ff7ffc8862ac3a2fa1f50348 SHA512 79834706c34b9e1f2f0fe31265542d514e94d5ae690bd40a24a9dbe1f1ac409e87af9e93db9357a1b8587322c0c8c513580f5cff69b6132b8250121eb6d5b1a2 WHIRLPOOL d0cb3e737229cb9550277581872928f61f4935d66969a7322ac45023ba457a4fe9fc2c1518bc43bd150098d561d4bf88e34f0f18d6b716c925d47e5e020935f8
 DIST LibreOffice_5.2.3.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 560467 SHA256 06854daa4df04605fb722e658d6b58b3ba8799e54bd04ce1395cdde8ee25987d SHA512 27a669fdd657fc03e47aa3c0ec77a2d368624463947de8c9d85ce3e4fcd2a1c34f8cf2c55742d1d1da433fe6bf1e08d82cf31dac2cf4867cfa219430d1a10b8e WHIRLPOOL 5cae407d275710151500a20fe1a872242577046f244ec3d9fe7f3eaf38b85aaa99942bde1f34d1fb154e48f3faa69ec8fe1fb52aa4329b72720208fd361ee82e
 DIST LibreOffice_5.2.3.3_Linux_x86_rpm_langpack_zu.tar.gz 493106 SHA256 862830a2e5246e1ca6adb7d2f171ce6a6ac5f0cbdc45ea49a72554faba2be267 SHA512 eb700633d1eae91a2874c7053df8040171588b07c265b5d4142389fb6bb55e8c020716e9d768591bbfae0eb5118fad88fe2028c0125162d1d0dfb136ae8b1a63 WHIRLPOOL 68f5c5b8be08db4806664ff1cecfa43df36c645330e76f238cad0ff54eedf06ad94ef80bd32cad2f16c2ee55ed8572ae1b06afb977810e077800ab73ba41ffcc
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_am.tar.gz 7944614 SHA256 25190e69a016c3d20e7112f4629575ab67f3aa4433317c14b794abc15cc713a8 SHA512 c50b220cf9bffc45244b37f7d671e21bbb6f9b53abe2c24b5a76c4e2bf048ebce61e202543ac35d38e74bdc9124d3e2b66516bbe064c9e889ac290a63206134a WHIRLPOOL 4484f4f9bafeb03b5e41d5d06ca8d17255eae3b54e0af2fb59fe721660237a39939d2bffb85f96cff8e36add2f9222baad577c8c09859ef8bfd92b2f0ca128ee
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ast.tar.gz 7890725 SHA256 2a36de95690900127a72e8c844cec27d50077f61fd6691215a16e85296f5c791 SHA512 abe6a7917857d5d40c5f600c4e100f533f6e8425a145876199d0076f46b9f94b7c2ad62666afbd9c86ab477ee8fb9f9005d9e1266c0fe3cba11cc282e5ba5648 WHIRLPOOL 1b9bb98c08db08bd919e5d7db3a768abec4e3d3686e0e474f1f0fd42dc97ccc36cdd38b06351b373620dcf7b339aac22838fdd58815dc23b6b4594d3d62c0198
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bg.tar.gz 8395810 SHA256 94e2740a0ce3db7a5b5618c58d63013a25585bdae7452cc3124c1ca0028ecaac SHA512 cdbc27db01e7d4c7130e9a79509c4e4637d53b1cf0600c0c82db9dec58c1bda5027de9fdb5946717d2a143b39c9f64fb92759c98e57076790df16ad302dff0a2 WHIRLPOOL 7767a8ef94caa33037f20209afd7553f6bdc44bde190e8f6cc3b06ac5745a8ec278ad5c5d188f7c25c3bd5ec1e0a96ae81524d120ca0ab83fa4a4a7ec638e2c4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn-IN.tar.gz 9207823 SHA256 af83b1ffa1b823941adb60800b521a0544a5d21c4f04dc94b2158d776f979d89 SHA512 c01ba3888eb1103fbd45e7af8d21e693ed9b7220e46f1db521854c5ffe2ea1ef64e04c61496fc9c26d11c64dfee10e76c0ab6f984c2376f08b20a4e4bc7ced88 WHIRLPOOL c3df95e1ab9661e3370bf18f98966b2db60dfd38e23d1696c93f47e68bc927db586db8b7ff263b78e6f510ddd3ccea1b99fda5d2c928f6af4ce63f8736b85fa1
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn.tar.gz 9208205 SHA256 28fdde2a2acaa55815d00aa29cec148e3d62078cc784057ddf1b5e139c225420 SHA512 cc1901fbd186d311988dccb225c39e2e08e554142e5ecb6d32365c42678489fed5e3bc3049384a554d58fec0580d27aec088c51a2b8d94920a15b901e1fe0a81 WHIRLPOOL 797dc0a30a398550dc625ddbd626b9a2c0011cdf9ad3160af9fb8c22db882eef794f15135580086cb9b4b1a2c353628f477117716217339a4f993063d84c7c34
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bo.tar.gz 8956411 SHA256 bb40bdb6cd43f65046d6bea7f279774a98b6bbb605abf19a422467bee43790e6 SHA512 2b507831efcec8fe2faeb7d4bead77a8b91666eef749f161d0271ce7e6bf499d00822538d24d4e9cc02d80f233218ba59f477bb8981f234e35ccee48c8191f96 WHIRLPOOL 370031683e9b595c52feb77fc8af098499052cb10a7fb304725ad61f28132d4b43d6103d90cc049d3475ea4fbbe7ad474db70ae337b153d20474b5bcf37c12a0
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bs.tar.gz 7186117 SHA256 d8a5a6440fc9ac75c66717b17ee2f9f33e3faadc55bcfdb4a048c9929ced2c26 SHA512 f587c8f8d0f0a53e65190af5dda623c00b90f46ed28f670b41eb947fffcb07150af6c948930329212fcbd6e60acf4a10ad7f951f33e228b6b72b4b8c34932b41 WHIRLPOOL cd48b85a36ed096c0ebffa8d531df7a8d265bfd6847fcd995ab1673042d4baa6b30ac3abdea1a1cb39bf7e2ed20afb74d24eef221bf13214950cb29ae5cbb761
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8030953 SHA256 d5279b4b922b9cc1df426def0113e43438883a594985caf925f7d20c2f2535f5 SHA512 c6382bdfa76e742fcfc2a6d6a12a118b412290ee802e3d8e14069617112e68fff7607cf96d6eb1853196ef2a60cf731d87994bce9e4835093a73799a26aa2df6 WHIRLPOOL 547919a534f3083ab110d6505af04f0d72e45f4808c4f165b02b85f7b2c26fe55981bee5cad5d03876d37018c3e758d9a9e76083bef9b18c917dfb893bf0a72b
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca.tar.gz 8041714 SHA256 cfa3a0164c47efc32dc4585b5aca2e296e1ec6305e759d56dbeeecd6ea29cdb8 SHA512 aafe1d3ed8214efd597b5635b0915f69fb2edc77584f71218666285d65b4605c6a05b66a684c6c36dc0c1d5267cc355ee2ba6ccc9ee7b3382e3fd8810515a12f WHIRLPOOL 8801245c78e31239be7444b02aacfb3c3cbc7e1014270aa3511565594af8ae213fc7ae5cb1a93cd1174834e7e0775be64f54fb0be5216b269f7f0b057b4d4577
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_cs.tar.gz 7648039 SHA256 c42780501321c48fec08bd9b65938b3825ba9125992b7f072389b271aac358f5 SHA512 54c65ed57639f94341ea34e80f5c767e5a435e28a17c1b82a8bc60845fab29e323ccd543ec8dfd85716c792436d03d97b4375e164788edc277fbe5c127c4103a WHIRLPOOL 8483aa6953e4505d14efd1a4efbdef245ff0ee7114fd2a4bf316a95256401171fab20fc65cd5492bcdc7567d8a03fb9cd38b9fe7d0a217625a2c04e2a0dc206c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_da.tar.gz 7651223 SHA256 eb1216b976f87bc7781f7d07f5926658266e70b4d7c921609bf6d471aebc930f SHA512 713e3b6ba2919479d896ca38d0a7194e723bec75e53165dc29974ce05512c9675b57c7ea8c70dd36190d4258ce619ab66e587e7fc04febdae28bc3be0013f9a5 WHIRLPOOL cda13fe30f23bcc331064b737b7c67ecfa728be451889fc02ef46c5f984d5a636432da50fd8c93e56cf51ce1be1c8c266d552a3dcbaea012a77fa9d2867dbbf1
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_de.tar.gz 8201560 SHA256 24691cff4a206be9750915833fffcbbac0f74c04709ae95705d112392b7511f0 SHA512 a0326e6724870f6adb1ec4a69a3cd2edf99fee5d3a0910a46030e05fc4aeb7a1044d222aeddf9faba3bde98b7c6deaa95ad98c718a80cf32b261ab40fc96bb36 WHIRLPOOL 5c733ead32fd3990b3b97cb82612228a8ff6a76f015d3c23bd23746a5e6a81078ba6676cf6c49b3a35b81e7e263bc63e542d7210bf922201624675b06405dfcc
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_dz.tar.gz 10408872 SHA256 f078ac44299549dbcf579e5f5ffaa4b893730775753220f3d83fe81cbe8c9487 SHA512 38994f985101043d88b829ccc0daeced94006bad77d55b0ad8483cd4a01c700c8f239cc1b903b1106724f7727f50cadf4215b8d9deb7c0aad022ccdce87824e3 WHIRLPOOL e13436ca6ff0fb45a14ccf8081850deaad877e9996751e1f90424e7d952ffb0d06e794a4628dc0cc16921cdae1702fc6ac06428a2e8fae8b64015fa36f36e74a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_el.tar.gz 9043638 SHA256 d2278c4a527d157a98a72564ed6ab48706de31bebbe830773367ae843d9b0a1d SHA512 5b07bde422c6adb777f6df1b7831fcc40766e45eecce844d223834d4c4164d965421131883c6b86b722f6b3954c0078474c0272af47ad9b4f8b975e4fa7d3251 WHIRLPOOL 9b101303394e5e93100a34079f346911c21f332c645b87e5e4fdb405ef491abe874a59c571c80aa90a43a967a07559789b5a5c0e1135ef93dd26f3fb120a6ae1
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-GB.tar.gz 6498736 SHA256 854ac267ffa39a241b11030092c90df0913394a4b7e8527f1aabc192d3a400cc SHA512 2e89bc0b33921a8d68885a9a8f9b4a9118ae2f05ff3c26a260449d80da7808fd9be1afb4cc3d690465a15669e85b1290932023c71f0a1e90a8d8cb1f3edaf23d WHIRLPOOL 4483d9f08608f119c30c89180302da372483ca73830ad75714d4494249709052e7e36e42bb438055ff3948020febd9383d9d2c8088635ab65e6064f7c1329f44
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-US.tar.gz 6536893 SHA256 96789b46e0b3db36e311b196704f2ca8099e484f3e2ba48f47441c09be12722e SHA512 6d880366fb68d9abba4bb42b8d987be1b0c3c7e3bf17b5c486a741ab90d5b5ca29fa18d0945e98f4f4bcd462000c65391d4dd38ed4ff7513f2cb073d47419304 WHIRLPOOL b64d358343a3bf89ef6b343cfa154942e02875e9ff1dfdefb64097dfc70355700620bfee7843a5b25c25f865786871a1b374cf2f5ee97b9fef31fedfc93994ff
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-ZA.tar.gz 6483510 SHA256 9b5afdbdf71cea637a64c17af6b57fa4892a7e9e4569c71a4681ecaeca5f8bf8 SHA512 1b4755773e5f2d42308dcec0285a695b55b84fbc2f33dbbf63434a111e970227d6b6cae2361810ea5ec760efd945c0edaa3de91f06b5626edf318dce04b45597 WHIRLPOOL 4d8797de19d75129c033caf2f616a8539df00b3d1a34123c2c44be4dd99fe363cf55c0050df08a5ee2e524a9cbb8607ec3c63e532ecd699f1adf9af9727d284b
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eo.tar.gz 7060940 SHA256 352d9ff84b5bb675dc2bc40bc8e4db596aa54bc6372dde6636d2c39eddb6397f SHA512 c4ed73a8ed73ebbb859883b683d4e0ea33c32aaf6b017a0366f3ecb5686cfb086aaa21ccfe05a8c7868ac09d30bcb865739d61a09ec832f0818959b21318573d WHIRLPOOL 129aed3926d50e8215a91b7f21cd2ce723e9c7a39eac59057e0620f4b6f25c6e6793909cb3f87e738aefa388dbb2e442e7ad595704478a992d08787f6299ac75
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_es.tar.gz 8062524 SHA256 5e662b6c7e4089b857323fcf0d0d58d48691ce9f6ddd1264b223af37a65f5fb2 SHA512 813573f15cc6bc397cd7e46efab826865655a60e8d10fa7016cc4ca30168888df0b4aac86dd31f67583abc8142e905b207d8b69c7f4ce36bd14436ed981580ec WHIRLPOOL 9c174c84af39cd5b9350be5e7e4259903ed3cbc45cac3cc566b2dfc2dca95416b7405549b172cc321b0c162f3b854c97ee2574d7c5d4744faf34a3f5e3ebaaa7
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_et.tar.gz 7581872 SHA256 eff090f07ba4caabb34a6969f4a3426273dac38aacbe4dcc6785959eebb77ff2 SHA512 bac6297dd65444f44b1198e090c9900fbb7ff66300bf53445be2bb45932898a2707b8e2feac0ffd588411621ab22e4b601df0242ebb02cb880f62ea3438adac3 WHIRLPOOL 918c20e7970710fc8529075293435decc149acd12d03a74b5cb72e5e20abc7b692ff972701028453eaa42f83feee46746cea0fe71e9dc640308330b9053913de
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eu.tar.gz 7622709 SHA256 bddc1f383ce953a6aa34e7f54b8531dda16c1e78408b4db6da06d0ecc13e1530 SHA512 62a9b3ab6c7dc1f745b2399a767940615d565106deacfb84a4be6584bd8eeefab2d6e8e5bc32fdfc3280d63ad950ba3054a51c4531d19be742ca1dba3c5098d3 WHIRLPOOL 6d5761d058f9148ca0eb09ab87638de82a413f1869d3b6df8db8c8106c1bafd2d11cde02b0f855be58208bfb41cb57a772706f39998c024608c9a990bfb27bd3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fi.tar.gz 7839456 SHA256 1ec01020e362b6238420851cf59a23a7fe4accf64945ba2169220644201f0313 SHA512 0edd2f6956b1f97e81447388472229ab54c20334e487ec651e9ec816ff9334c1a80813d49446059cd649fcac739d2bef84cc89602ff79edc46dd8cef094dbe17 WHIRLPOOL ff8821891cfc5833c23ed33227b20898bcc17c79d12ad36a905a99b30433920889bdf957d028b4435ebb013ed8489d99375e3b7c686d86b7ad3a89705435e090
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fr.tar.gz 8249414 SHA256 28ba59877cd4fd8bb8523734bbc821292b14c4964100b06014a6d832a9dd3dc9 SHA512 db56ee8f46a98c59e1d70839865626093bec7ddd552ced6be42d63e92c9c6b27b345ebe0deb8c845d1d157758942dc9941939bc1d8e708d2ac4f1b7197d09025 WHIRLPOOL 214726ccc38b0dc39819b4aeb10697df3745eb7b2b22005b4699df3d6b3a4108621868b044f694894db8d00817125f13d651ff99e986abbd3aa2a8644f7cd9fa
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gl.tar.gz 7774185 SHA256 91838501075baa5ec6107ae41545197f77b4409b4dd9e362d6053a810815adc4 SHA512 559a26d2ca66e56356f7d325e5435232f21fecd533f8acd2c8e1c150b61f1c6661680344fedcdaa1f59a4b43912b782648a2827a82084beed774f3a14aa53324 WHIRLPOOL 95a4f1eaededbfa0cbc77928b12aa6855601fd0cdb44960817ead44dd80c2d5be16279f2b8a77c3e55808fb009f43977597bf39318fd37bb0d192e3357b7537a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gu.tar.gz 6705351 SHA256 fb5b2c0c50cdd44e62c7de4f7d9a723af4704ac5bc49f45bb0c4dc47a35b58ae SHA512 517fafddb8e503833aa653fcc7dbea745db56d52d0d5a9293d2a8b54354d34bdd137e5e9b8b9046fc60896e8d2534c363cf8021e73ea4f938cc89426bee36726 WHIRLPOOL 413a4318e98b1b1beccc17048c494f2367071c61e06fd8158fbca6f558595772302497177215e8c4cd6efc75aaa8a6928b04a5773e1decc2a1ce0e920e2dd755
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_he.tar.gz 6329372 SHA256 298b4e63ce9222dca54682b8d01c5ca3105108cbca3d4e12ab7ae817c36f09a6 SHA512 fdaa0492f3a4f28ac5f5f64ba4c9edb2e9514253687acd9126b6840436bdf0e819edcc81fe0b53acdbe6e7b9bb48aae64e196898153b003e5b10fa2ce37999fe WHIRLPOOL e1dac691b55673e9bd76b617ab6b27d472ffeab742b1b2a9e17bbcc007e2d00569d6bc71c355ebd929a1a3031a8842afdb53201673e6aa4624a1f956aca625e7
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hi.tar.gz 7383967 SHA256 a6db33079ca2ad7a51ac83301ee528993ca099349afd9c8648cf7fb43ba96f02 SHA512 2c86a60fd8028b1cd0e2b331544f66475fb1a92e4c61dd7ba7e24162df3d7c803b5a3a1992c031cca62a12c35aca3e78c1e29e9571a6c957d3da1daa70900266 WHIRLPOOL 7a7b787b57fa3fb751b4ccdfaac40f3945ebb805f2a65eaec7a724e02c6634242326eed71c0968ced2c1e341d678849da37dede996583a081c97286c4a6c0bc0
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hr.tar.gz 6876505 SHA256 2c1161f559c56a415c6c8f381e9e2a65036ab6331f6d8ea9e0c0db400122e4d5 SHA512 5bc9e3c6ea943c1a63b90499891306683683a34fabc65ccf9c25759532a41020ee01a3aded7672ef967bf8c1b831f1a078170fb92495dbf711505320ff396e38 WHIRLPOOL f0d2a2547164d77128d25fc9275720baf92c0ef2d5da81ac833647fe802e14c10eec1c37bc59b35ef37bcca9b84855b48b48d56d93515a05ec5565a3511ffef8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hu.tar.gz 8078657 SHA256 f0e0f79896372ded1d983ff0c11a554c4e75d5a2c801545b2b60e1dda75f365d SHA512 44e58ee6ee9077f344107877e4e8930aff13eefd0be4df4993cd96e8fb5c96aa771e3939e0c609854c96a631d0b844d9e153ca3bf94cb12f402fe01683c1b7f1 WHIRLPOOL 345b1876dff9a6e898c67a4918b845b4d298a38c49a3198f00b50d016fdd70ba9fd6fddd60ce92d68ac79954bbae41db5f45512b5ac1ab3323c4a2e4a34e2fcd
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_id.tar.gz 6912753 SHA256 7baea6b914b38ab173159687555da7b4c4e84022f53c998cd0b5f43700d28bc8 SHA512 e2b8a07ee13b623aaf80ea5c32ab6a54947be1099b9d095c041d2bad1907c7ad24ff53dba768e93dce776fd0c122ad68a04a8f151cdbc2eaedc0f0ecfe507a14 WHIRLPOOL ffa374e3a0bdffe2d1e73292b365aac6ec52240279c619f84d47d6f9ef9aa203c771e95ed1f3d3d481cac1caa992609c1d04a34bb2825196fba0ae55b4256a0e
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_is.tar.gz 6974340 SHA256 8a33c1fd90f03e19125ee54d7e553d15ac5393857a1032ef34c1e0216cd1beca SHA512 ee12038a9fb248e1f7b6ee30fa9d90bfd3669f397a95520736cb2cfb3e865eb9f2808a2b9053096a8478848c15a938088bb8c668692160d7e39666e598868f22 WHIRLPOOL c915c329d9740839abbd9a400d5330e6ebe7f3143b8aba0493e4cf5a5d4da4f8d935899f461228928be4b11ff73fee3fbe2aa9aaff8145cb6887654e16e06a77
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_it.tar.gz 8005376 SHA256 ac3be3140e03b514438b5d4fcfec2a2fea1f9c022f6fd3f881c0579901ffab53 SHA512 558730e9bb35cec22b85774384a535f9791e0ac020979f93361fc5897a1e935e1f2df5a8a569e568bf082c9626a135ff44e71c23d68840735ced4d58e246241f WHIRLPOOL ce1fa84de933422b45b25a1923b882bbc41b210afc18f1d01b2afb668143a589e6099144341d9528450e5576865ccf1d91a56e6e4c6740894431c89006dfc503
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ja.tar.gz 13413963 SHA256 3165f6f14fdf8b617d6099f6247387b77a519ed4264a146e3ad3c9729eff1a45 SHA512 307f4f6f60e49f6244b1165db63de7971b28b640ae3a48dfc95d2362af90dfeaf4f7de472433bfebb4191caf66dfcbe0ec327c8eb6a1a8c503bd033d83eca2ae WHIRLPOOL c3b907162e2359ab615a336f4fcc1e9e4b8381da4355d1f87cd68b11b179080c32a1b190dd07de939d00514295b3fc25469fea75813ee8b7c7e208342d63fc8a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ka.tar.gz 7175203 SHA256 2278fb510c45dec0fc08d3dd13a7247cac23d4558dc5d5c3bb835a1a394e3d6e SHA512 e965f6cbdc37884f2c043ebf3eb0b34826b80f87ed6fa18018ff52a49cd8d149c135be279e25c159f7302c44e5f40e2a66581a66cf9e2fa9a748a41c23405043 WHIRLPOOL 03b4f09ed351861f630c44f1b061554f41ec147dd32060eb6f8f9ce41f873283ab35d14d0da8aa4b0aee5dd4046d4bd021da494fa79033f55df0241e19cb6ea8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_km.tar.gz 10428479 SHA256 c6810a8fabd7181761862571d13f60479fd5efeeb08cb4b6b993f77b48f336a1 SHA512 ea7f5981341a0d08d8ae5599854e22fcb2042dfcbdf02a701e360cf3dca84348f320756c25fb7e41da70082fb9fb7b5684472dcf4b9cb7ec9a0f9539d4fd96e0 WHIRLPOOL 213ea753e0b9472eb2e04c6c8bdb16f87f5fb762eaafad0d0e3a8445f5f73dc2fc590c16e9c4bcbddb9e67f61935258a47436483c379bbb857aa6b5ef59e49c4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ko.tar.gz 9451678 SHA256 053763c9c4dfb1ff9a1a2ba2f0547be5f333c0c6c98c6f225737746226093837 SHA512 416bb8ef782f8344cb3eb750aad4f9ef65c092803dc6c885b7d10ac8a717300dfe77f3a445d3168ba742cf20943691b3f691c6cc7e436b23a5da976cfe787dd7 WHIRLPOOL d8e34276e299bec7c1ef6eb9fb7bb903cb87a434beec21b6f0bd18712bbb70316f0020b9dc47158e004b33923fe5cbdd3420365163f6a44b5dc976f7a50f9b44
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_mk.tar.gz 7400499 SHA256 e1627cde5674fdf6b27539f702e50064479b7d4c173a94489db8d00f29b425f7 SHA512 36a8003bebf2371009221d2a43c6da29203671bca2ad9df5e0f2bf0d2a8a81ed4a370423c701a1e53ca18600b00cad302a4ac17ce5bd37f1b376e29ca3c5f2aa WHIRLPOOL 39e52c6e6677b06c1bc469b7d54dae26b8bae1ce07fafc560682fe41e1162bc62007862e12e8f370467fad98cd4f835be44edaa073b1de9b0960a671f709b723
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nb.tar.gz 7723319 SHA256 d4c652d60f5949c8102db7744b63348ed0ce6970d74154c392a621400518e70a SHA512 e61f4863b53bd36710007d847be8bd0f25c1618ebe763cc88b667e369d4d82e621e52830c4c9ebaa99472dd1c28e22acc564a1a1e80ba539f82f140a1286ef63 WHIRLPOOL 7295f92a3128493ed82191cc1bcbdeefeba3509cad465d305e10327906922cf1bac129ec63b758be1e33d60060f775aeb75f3c9ee9f8df1aa62598912fcd8453
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ne.tar.gz 9859378 SHA256 1f7df501d48d7096b42f3b991c16b61db53478cd201a80e7489f3205ec48631f SHA512 ba223cd7dbf61f530cdc1b8e678621db898f6504f9c22d47613f82ee288b6a7c23e68359414fcaa72c3a0e316da8e580ae3cc839a9193010ba7125ecdf92fb48 WHIRLPOOL 2591ebdf7afed6e876db1c6073a632cd67ce809d38f092b985b4f2c6071f8bbb35390c24e95c078da5e8c3b90c6fb938a3da131ef6783c3fb15115af0a99194d
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nl.tar.gz 7816882 SHA256 7e6384c94b564780b8e514c3084281074aa41c143a01b6977e40cd75ab07b802 SHA512 2352d081a0c6956dac553d9b8256b6b2520b6a4d8d4ab08f050954b25cfa72ced1375f70b0303fc32f9bee2ce25d3a629136358c3bba6abd75ffc84eeff3f1d4 WHIRLPOOL 4a6bedb7e508e79beb67df8105a56427fac9d594c22b9f433b7740139c62ec9ba306239c2d982f2dbeb8dc601b9e4596301cf730a3996e06f08fa03cb58323a5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nn.tar.gz 7686967 SHA256 f73d81b65e42b8d9e1dc11bd5542be2a53cee0e4a55ff28a02c9a22ec5e4190c SHA512 dba2a28f1c1b20494b82dae71bea4ea03b30544bfc14282c8da53fa6195323a88ad7a954e031ad4d6d94112261aa137349158fce0712067005f20be8ae5fba8c WHIRLPOOL 8c81903d908d3f212f3e29b84103e8159fb022aeb4a7e1ec12faabb0854fed90038ca6d21cacb3543632844ba8ed7ae44d4b9f42cb2559199f2f24b0bcc2e7a5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_om.tar.gz 8063423 SHA256 361db58150877d1ec47ae31451187bdbdf1727d26a6ebb34d2855f31a9c0f1ca SHA512 42bac85b57d183377a9e494a0929ef521755a109b02dca4c84f62c576b9f19829363a3182f758355a6ad49ee6ba325961a5b035cce94505a78fdfd1a58954af3 WHIRLPOOL 175954de8dc2b0a5c5b24d6169bdad00acced87d07d0d75f498063d2dd6ddc616b64424ad807c596556979f57499bd7e7bd4cbe0d6d926eafdb269ed647ff2fe
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pl.tar.gz 8084792 SHA256 724b5984ade64f2cfb13c753c7cee70cf1b4d80691a82d31e719ffc176f93ff5 SHA512 fcebb2d4b1b575d46ce157dc0265ccb4687f3f98baddcd247808553b99ac4521d086b762e260bccefd8244101b3174df72fdface8d24988acfcfc248276c5b49 WHIRLPOOL 872b70197107a50b7a77f7e0315b1d230336888d5d635eb37bf8975a35a0be210a076e1892fceac3f156721f17f1b2eb01ac4390991fff133c238533fcd12867
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 7823378 SHA256 1a5265bc46eb3408ff927cf51a874759bdf7976b85e5037cd264ef501240f4e5 SHA512 6d7c85bf288c993bffc5c4c60a4c7911100a1759718052e48513a339866c9132d6f5d87aa7f2f152d73ba5d9e007b2e0e4144a1281f1b651c46360d5cd980cde WHIRLPOOL f875e401b15d822e58ee6809d572096e12881c90ddaa19ee06edd4fbc4b845f295d75f306d379dfe7e359b4d5469e46a08bcac9ef0031bc3e19b315be92d1c3c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt.tar.gz 7747467 SHA256 8445280228223426d40b800db676e771221b680b758318d643291bd9aab36338 SHA512 26b030a67fc29c8a705098498fa09dfec8184c6d52d322063a0795bdf67382ebee3229f3c00d5ef9414c5162ba4f1d0595f0b569a7bf0b9e91b69bde021b853e WHIRLPOOL a2d6e29ff7735fe3f13599ffc79636948db640f3f6008aed58389538551833716ec9f57bc0acb053bcc5a4b4633bfbb41f8baea3f8b0a0be06018d41bee6cb28
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ru.tar.gz 8492913 SHA256 ce37bb3ee9d5c473be432f106aca4c50d5a36132112bac204e5cbe1cbc719bfe SHA512 bf4dfc38a03a972b92f96b60cf3268021b7fef75fc40713352e10c4b5901693f392c50d9e68bd1e962a57a5a6c62d6752692e343d377c9441df87bf9363e1ffb WHIRLPOOL e74138d848e48f50d0b3421c2a91ed6d2adadf6eedaa5c6c8f72485cdbf85cd9e105df9dff09f747e6bd8fe97958d45eb87f0d72748280456f1856e8fcd306b3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_si.tar.gz 7255384 SHA256 b814d3e60f6c0a029f721af302e28d60c8eceaf4d3c865c2a9420c9df121e44e SHA512 3539093e7a680b7e517bfdd094da46e0ad2588f55faf93921c4c328101e8d38d5790e9719f8216cf2987b12f7664841a305e2283f688d0d211c68b9fb65e71c0 WHIRLPOOL 59311ab7e5d02b574250aa08789c809daa36f19bbdf9ec298fb5b470303872f7a6bb1a34139c42856d4a85ccbc3997a4a4446d0d3a42d5cbec09537afe7a5f47
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sk.tar.gz 7561716 SHA256 8dc468f0187012b9aa9324ad401e600a83a56c13b3be97768ac2b75a25a85cd5 SHA512 19e9ed169bc376cc9abdf40973cb219b55d343088b0541489efe2e58d1eb5c743afc4b8c3c61b7092101554f67dc33c03f0b4c537ceff07ca66b8e0b0a79d209 WHIRLPOOL d2aa36177924123691459a7f38da20cbf18279d4b62f82069cc0a0bf1596aa0e461a1fa8d28b67160624309d3e6efbcb71291978ee89bdeed27e0ee5961dce73
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sl.tar.gz 7822297 SHA256 d12e5a81026124395838c283dd34e667e1f2259a78e150b6762a204b283c42ff SHA512 ff9fc691b7db39a17399768dc6d225e61fc7239cad05e78ea8ad93716910c107a0749b10c1fc3d0267df8e593d783abb6909e27dfba6313d97f2ef26923420ea WHIRLPOOL e4ef73a8357b54db4dead676d7774ddf9ad1fbd95f2fa8d0482569aa5cdec6904e194a3bfb3f7b00bbf72676e8cb0bd0de8ad28a2d0f23c04b4e36c8cbcf2693
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sq.tar.gz 6911509 SHA256 ba7d7179588052b1bf40e8294f1622b51c6b161fbc9cb29311d26e73096d9478 SHA512 f4946002b6599f55c5e14f7cbfb827234eb62b638985cc452972ac39002bc17f2eebda6fdca2205bfedab2ee01db4c5eea399b784b73aa0e1d315dc2e1e466a6 WHIRLPOOL 76bf7ed86899bd033d63da48e259579020408b68dd7215b6e471802b64e660b7ef090029e70418acbdc398c534d4e8f8c3a0e6c6832eb314cea79ffdc3d98d3c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sv.tar.gz 7777064 SHA256 ed579c8a8bc5cbe9f182447cc5a862c544387113e513c28394737acb67f93574 SHA512 776b130c300cd928bf29fdceb7bbda62654490bcdd8a187eb75cc264ef0f8a701c271133074f2e8aa8856ac8493d9bf6c604e872b7d3c04715c76b6316c4ccad WHIRLPOOL 71c8b14d315cc566ef8e025d97193cc4572e2e1650219e5415b6c7cac8f9ddb4421434343e3995033887d60276370a13a44648328d0055b9dc55476a1e44327f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tg.tar.gz 7246920 SHA256 ca3d6ac4c751c7dc4996fee6b8d04b345bc78af497ca3135c2b78c6188c00255 SHA512 6743e77360adccafd521bb729436031e0a445edd13f8b9733bb95d6235b28ecbccfdee0b9d71892c8d75528453a2874dd697124905fcadad290fcca97fba7e9b WHIRLPOOL eb70593b7db2d8459e11049757b09a054d3feaa9c3047b08a23cac1832efeb3c6ceffe52ed0342dca403d78bec6c7407edd3f7fc77733732b7548cf418ce1fb3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tr.tar.gz 8043357 SHA256 ad615ef967dcaf013a190c90bab31b2714e21a4c296174ea40dea4be1ed76879 SHA512 11586313b896c1887efadd6190f60200ffcd4c586134607d3a9785ecb055f01f096dc445f9116d3a82e0d572a6d1c2f2637dd1a03265011bf0b556fe8b6399de WHIRLPOOL 272125848f906ee471961bee1c9f3717fc761814a4741cde7dead4d0e636eacf206f5da6bb76342585c44a2067b15cd455a90dea749fb8994f2ad92b9ed3341c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ug.tar.gz 6900873 SHA256 eaf09d605c2801de9c8093e6a7fa19970c0bb85f97f75c0e06e260d2c842e0cb SHA512 b62b70a71841fe482dc02eaa1607bbcc4db84c84b7be2d6a931ba75912d84ce613005fd45854b606a30303119dee4a82c3faed06880d6947876cd2bc9d61dc98 WHIRLPOOL 8e357db9b0e9236efe466c37b3690f526cc9665b8a0d08279efc289e77f2599b75ec5768e2bc294918e71a89bea1820b672632357ee5b6f339f4cf6474b01ad2
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_uk.tar.gz 7689260 SHA256 0c65d2689171ee891285129f5cddb56e40a3e365f2d6a7621a061f080f0311bf SHA512 ad08571649f8ecbe8e3b864911b0f75d043cf99b79bca72ee8b622fa67bc9b0f5c2f355f686a394863036fe500fcfbeefc71ae21c6171b29c78eeb845745718d WHIRLPOOL f39ef7bfbe7d89c6b2a2b6c839e5877231382f7059a32a8e05e48fedc7b0e12c7c63df2a9121e8b2e3e9c02986d88ac0c41b2d4bd256aef101fa1d81fde97a5f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_vi.tar.gz 8218457 SHA256 c38a3473c0ddf692bcb8e39467bebadcaa783afc11b72ecf909da5aa6e558e47 SHA512 719b6e56b2c0b11e5089d18fb3cd979f9ca867668bfa5ed7da417aea2a4d98d57c4b351ebec246b04bf6b95e1754769e8ae29b3ba60dcbc5cc9467bdde1043c4 WHIRLPOOL f0ca8770d4f26b24dfdabf7a344a6d6fa76b6ef9bcb24680b86babcc9f163c156abd5c29dab7c5841b415f9ea109ff24890cf64020f3ec5a2d339bb8cdf5c243
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 10778840 SHA256 27d5c6e55ea4e088d1690c690cfe7317363180ee1322fa4b3272714764cf024a SHA512 1b47e1d2c069ca8223775fa23538c2f2088122aaf33dd81b8ac37cac735cad334576e4bde6f1ade10f72e602f6bd3d79eeca8bcb96b95b8bb6cad566739ace8a WHIRLPOOL 2d7b07c224bffe60d8064cfdc2cce1489d56ba73ae92da7b4b26b528c55db1b9f68803e6545bccafebe508707243fd754a6cec479ca7fbfaf7c18b9ee364c220
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 10816015 SHA256 72bb32936f1c02ddb0d07817d8ff3ccc5a0a00db6928404cdad2652610c3826a SHA512 6764629779e2e8831236d911b503b22160fc4d83026594423a00dc2372bd6eca00e6f0385aee838386fdb26d68f9912468198ff3519f744a5ac1b40dcc3aa828 WHIRLPOOL e430c10bbbbb3b7c9b366a4fc7097ea6b739db153e9e6b1c2ee1061b2540a4e19d3b72a8a7ce6a4a1b9703b1ead00ffb4ff145d5fb2060bc13ae7cb199034b06
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_af.tar.gz 1104586 SHA256 18cbdc71e67d8841ed94e19b23e46eacb829a9dfcc3d2537695f880b5126dac2 SHA512 3adb0583c7e409155f0516a9b80331a599e3856d1d0756c0964da50cb226793bdd6bbedba6143c43313c6f39fe27e03a78313cdf39c435ea30b21dd1714db7f5 WHIRLPOOL 79e9510d24d85cd07b1fb21365721473af26e5bfc2b02ec9ffb245565b0973c6fdb67ba7acc097eefe143ab034697519597e8de81e9ba953c287b76abe41072f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_am.tar.gz 510628 SHA256 c905f8b73eca7cee6db17a2ec76e9607b4e56313eb66f3ada3a49eaa4d43e6d7 SHA512 9babd66eb75e35995a08606bd9709cba28006ec7a92d76c8ea4e469ea427de471cef0ce58354278464b221899e4566a4fcdf638b3635b580c7d679a530649d22 WHIRLPOOL d2d74d8a87b76fc997c2d7f0127b8b57e841f9f3feb687e7bf568c9481b4b9b60d43c14ff3a762823bdf4cba0019e23ef05fabdc9e8a21e326510bae478027a3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ar.tar.gz 2251404 SHA256 36a55a3a447c30f77a78b738e33d1f9805e076249e6abdd64ece5e665f58bf8b SHA512 d81fd1cf4adcec500a4dd26c776d26a4c39da5a922c69693a37a654d899b0e04005577dea214d6c98337f6f4dd62b82df5d46330fa4b8fbeee49591364001dcf WHIRLPOOL 756dfaef2c1fab1414bf43d27d84ad80151c9bb43f34478bf696c1dec5b3e917a42841ebe3e121ed26a216d703f64da5c2084b5e6e1ede294a045730df9414c5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_as.tar.gz 534597 SHA256 9e84f3b273c11afefabe787530e8c3b614a2d374c021e03276b8eb00a79a81d0 SHA512 1df4b3984d9fc00218b2fbef3ce363c4357da83a9f0bb087df55e3666dbfaf0129856ac178fddfeb19732ba38a3fcdd5eb17d72a8f0475dcf2b75cf25ac2f2b8 WHIRLPOOL b849a6781823d47e431b8a97f7fab7b9a9a881b4a31af8db5a309374f3d8e4a070c456a6f57677b438acde56644b303722dc45cbacc77aff0a4093fad7f783fb
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ast.tar.gz 492580 SHA256 01954234d381f77a3dde74403fae768e95fab7e0890039da67ee32be5998e9ed SHA512 9606961ec4de72f2bc03704a7ada2d44a98e96d8f2c09335e63d13cbf22ff0104dab043e9d0221d15cd66b2d98458c2961d0896fce7a588d5605518ee9ca4b82 WHIRLPOOL 1c3a1bcba3b78b47db7dc7edea86f498a03172bdb02d3e4a3b9cbdbb05ee573fe474a0d66894fcc02eb0eee1c4eb44b2c01d00a613e0cb54514a14302ed2a4d7
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_be.tar.gz 871248 SHA256 714312aa82ada3804fe605036657fdd6f57b399a58c2bf783c482348fd2b9c3c SHA512 60c37b551db7bc974b209e4bc942033f584d5eea1f2acee76ec1a0c86e40ca8c309ede1e79040782b826e0e8a43924cb109395e601693e7cab925657518c5da8 WHIRLPOOL 983b32dc5836be1ca78067ec339c63c7c79a73f2377256f8183c8e0dbc5311345a07bb922cc349f72054659d9930e66e37483bad3ad609653b2a3954cd7dbeba
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bg.tar.gz 1951134 SHA256 02cb9e4d7592dd9c68aad2bb36d10dadc8e309a7c1326c22b6be788401dfbb35 SHA512 571182b6dda2452869f443f65fc7fa44a4cb9ea3aa2bb2e7be4a227eeccf34235e49039602c2ddc8b0bd51d1d4f7fc09644302a7da9935dad41a7bfbfabe4e80 WHIRLPOOL e8007c2cef50cd89648cdc152d4a20299feef38eb60f848deefa7377155cdfb79f608dc7ddf7d3537ec86e1b89e39350edc291060bfc7591a29c4a4847a6989b
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn-IN.tar.gz 541653 SHA256 851d0f29a3174154b99bfe0f11c278ab55a6f956b39ffecef69a649c7ef44a6b SHA512 3d01b0e96bb2029390e8180d8cb959b83b933d771c86e03d96323c8ccd8137f8564e9a9aadb851fc9e9b55eeee87429c34faa78cb8eaedb7865ac6dc0879eb46 WHIRLPOOL 8d983f9337f93d85a15f16bc9bbf063c4d3881741707fbb70a3290668cb36162b3fedd3c4be0c8dbb71746398729443259a5c83f3a5e5de87c1430ec65479acd
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn.tar.gz 889334 SHA256 2e7c0bac6c97aed3436e684a8bd85395973771628fb339da15f5977cf6a60248 SHA512 440eb9a1be6d79f57ccba9e9b223c0288d239c5bf3256e745d73b972b4ba4f3d4b6eeba40c499529e26e2366a10d4b8fbcceb8f542c8af4e69d02ea75a6c960d WHIRLPOOL 614668254e3bea66908781df8bf3864361eee49e7dc13a3320bcff38cbe918f7ac86d0f7b25f68ef94cae9cc3eaecc882d90d68824ad24c931e631b2c33a44e2
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bo.tar.gz 522985 SHA256 45a01bbaba56973799f04b24903b18b350e59b1f278cf7a520fd21e9dd622851 SHA512 3a60ff76a844f97186103202af1b0b77ef55bed22f0adb0f199b8d6a413f6e8dca86bbf6f0f3ed8331dac036b7270ab2d212959905c11012dce97a81b8043e96 WHIRLPOOL e861a14d5e933ca65d76b88baae91cc8a0461af8d20ec2e83dfa800dfd66aa463308c9cd8643a697c940fac2911235b63ed0df317cc9fee004d1cea11106b753
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_br.tar.gz 1708274 SHA256 dba75dda58f82d6c9565200ae6c2cf14b83a29034485e890c947bbd3ec16411b SHA512 b9e9aed9bd9b6555b1c8204e9bc641098e1418ab8df0b1c158b3442af98838f29b22868183116e7bb53a179dc9b30c5b3a48c4f47065aa6e7863f15a8b873902 WHIRLPOOL 779afd7fea2931dcf4a04cdb30989a2f6f80a57b279d4b06bdf0365a8054320f61164efc8617f072f70c40d4b0d4a4bd675d8ae262b0e7d92ef79b8e166138c8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_brx.tar.gz 504182 SHA256 1599ec1b14ed4b03d1822ded26ed7fe014953f5bd1c67a5aaba43825ff2b757b SHA512 bac1027e39c3427e106738d9cdfc3939fe43b0355de0eccb1498a8468ceaea9e4914bf1535c29ae1939c2082ef75f4e583c34f13341271777a501479e48f5f1d WHIRLPOOL 171dd94bd4b969ddeb7ddebe768ce914ebb0d716e66db3f9a80968838fbbe4205106de9161459e61422afe59a2b279b0c1f21b75468b89bf78260ba30c08852d
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bs.tar.gz 606406 SHA256 048f0152b647e124b20b8e7fb0af29a196653478e54a92a08a6589bccf39b8b8 SHA512 cd85eb8875c077c7998a9aafd329ce10fc3421b1a1a762329dee9e788c2adfb270e854fc14138a729d47b8e790292d8acd0ec8d628edd35665f273dbed53416f WHIRLPOOL 80a0b54e1e503424293201c38d2a0647add1923c7842c5158cc094f56390e58568e78cf0373795f31bb5e39fbde9df8d5a31406ab4df069aefc0d55d285a2c90
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1760307 SHA256 d75d4128edbc875a140dcadcb4642481321fd08e3bf6a3cf529e16be2bf487b2 SHA512 e51dcbb8d02fe4490cc01ce3cf407dd300c12862f76249f2ea7a47d4c3ebb527c4b8f6f069d77819389a40a59d6a47c3e8719a8773000cf601961533a83fe871 WHIRLPOOL d7f698cc70ddad41ac22ba15e0849c3eba7cd0d5ea7378acc853b7ee8d2437d1b57d64cd6e31ae421901645ff2ebcf0bac5511b27eb83adb0106db82efd0a3fe
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca.tar.gz 1764125 SHA256 2697f3d27a15e8c21e07ae08cbe43db2463cf70d8bc494ec5be6e8d4541bec7d SHA512 ca72b4a3e4a0449b5bd43f262afcef985681bcbff77c6ae204c77370177434dc4992323f197886b88ba9613b3200279dbcb9bf74f6db7cc4987ede7d1f373086 WHIRLPOOL 0d2206acad8f226b167b8f7575ac8d0d6ac80bb8381d46a365f9b56c7cb950daac72474ea1273ee6fb1ca536a4eece594c20b21e90f31bdb1c8a881adf0c3268
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cs.tar.gz 2956424 SHA256 c4fae63a6f3c4f77f4d2fc013f64518aafe3dae7ea65c30d2825357eb2deee53 SHA512 78fdd7b0c4fa47c1fc1020c7f9f3934e926717521b09999b3556c3a5aaeceba0e5a1acfe4cda19b68ed201d3b57a01853b883ba159515c0a805293dc6f99b7f5 WHIRLPOOL d2011b911c2eb9cb115bac2244270a5e94878066e675d6556226dd907b0698b522ed4b75c233ae00bc29e6901f146048a58fcb456f35f3a8ab8ee3ace45cdb8a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cy.tar.gz 473325 SHA256 cac2b41dc13aa1420589b2d5d8318f5b767801398f799f6ccfc477343359641d SHA512 3adeccba712c6b7399c1d0f8129bdf9133a0639d38e85c597eea9a408f56174a091816085b27e61e091eaf94e43989b17802b4fa39cfdb2ede8eb213b08a3a9e WHIRLPOOL 736731dafc1473d6616f52725b24c2dffd908efd72df34080915416de5e5eca0cbca93875fa71fb1f6c7084c7ecaa68c04448ea8c2c20ed284cfa7c371d0bad2
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_da.tar.gz 2378050 SHA256 f24c99d7702aae0bf2ceb2c058facf668a77842b5a59bfacd65795177f00f713 SHA512 ef4634da82e4e2ad019326f8e25c3d6b6734b739d40483e4cc2e54ae3180f90ca65aae30adf90008f9d04de933f3a65e9204731839b8b066ceaa2ac01828832e WHIRLPOOL 404a607713ee96fc882b821a159ee1a7038d4efa060da10304da87034cf21970b256714e5c51492cd6245a03b7c0d4a6da807a9c18a9343e344d4f6b57992578
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_de.tar.gz 18831224 SHA256 c23a56bbd86124a90555d975beb843a96c996072210f0eab6d5f4f28c9d5a6a6 SHA512 8442d45f00d5063892ecf0e85ac1bffd1423c1dae74ddb6d0c0315a78dffa011ad170f7e96b2ca76e5da1674e251fb0b07c11e91823d1d2ab6e48382817502a5 WHIRLPOOL 65d5f6d511177fd7eb3499efacb2bf1475f48aa8173a74e7f340275bdb209cf41ebd8e224dacd9816fc6f88dc4cb3c427e6f691687902df0b362477c42800f49
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dgo.tar.gz 534334 SHA256 591b9aed377d36ce0b3d2c10e115b72896b6725b797bc08cc5768d5925a5d8b6 SHA512 cb6e2dbdb07bb3b68005f848ab32df0040bbe10cc03ec2e56a7dc61b5acce8825dcae55202cfefd377e2234a50159baf137c07d0a16c8c3f990e8ad3b1f5d3a3 WHIRLPOOL b8abdc7696cb2f1c4870dc7a7931fc724f0212b3a44227c3a3bfb8d601fc47e1cb781f4646634aba5700e3a34a4c0a52005ddcc7e3c3b000890d576181bcaab4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dz.tar.gz 528624 SHA256 c481781270d6970d24e14450bfe66d1130de5c1732e6b467f3f1c65f63242b97 SHA512 99733dc973283f3c40cfc8dd24aaeea43c96cc2748eb033aab4ac00446b71938b2bff04b4387c825afc50359313af87a6d76de3bf37b9f889bd8f9c5213575c2 WHIRLPOOL b78c08c5afc7a8aa933db27afcb284140df63a311fe50380e03e7927f65ccf65595def2fafd62986b52eccc0843aaaface7b2e06acca48e9791372d7e9fd3ca0
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_el.tar.gz 2570453 SHA256 bc0395451c008259982da967b2ddfbba2423e66d03f8930435b2c84a8bb40a02 SHA512 0eacb0a6d5fa1c2a49baf2e28a1aba705a38e1fc5f9cd1f30c81c8f126a2e2ed1699272a4ed85907a299d3b08f064cedf561c0f5664c0234a12ff5b01ddd8f14 WHIRLPOOL fa85e62caa739d9f9b10d6f25f2195e24d875ed1389eb4912a72054368cd1eac07dbef79bea416ce2aa9686766e25e8ecc165729adc4ccf8e590d17ef93e7fb9
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-GB.tar.gz 7060364 SHA256 d7d51f8bb41b4e77b841014f294c182cc083ba0c2b08b74611a645d340d954b0 SHA512 7a25ba1dcb28b56bdec70f019b47e2f7879fa01b32a78677dcd731ecc130aa730895404f055eab1a69484d154a29d0791eed667305899fd67de64066d9d4df13 WHIRLPOOL 29cec29f0c4d6720dbf2256ebe818311880675694fd12c71282a84364c035f3776b8b169185178ceb49d85169f50b8c960384f79561b443cf505d28a23dce753
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-ZA.tar.gz 6977572 SHA256 ac956feeebec0f3e5ad0d8dc77ffefef660ebb4e1ac090db30085130792c760a SHA512 143b9c7f562741949bbde01eb540098f61611fd476a15aeebde63bb74b6a28c89e69358fbaf3a5d1130887ec36c560eea4634a26fa66bf2a4ce51d41a6574e03 WHIRLPOOL 94d105c4eb73b6c6da5bfaab7bc88400791c054d50998820391cb00338f47b473dd805e2e57f2a6565dbac6e99df9ca5f88d6af9ece5ca5223940e2026840cd4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eo.tar.gz 469289 SHA256 052b083d7b0bdc334eac9588e553dc87f3c61f20bb15c87095c9bcbd0a65badc SHA512 81c73f5a6bed3ee317861398024ad620ac97db4b98b9565c987c20c5edd82f42de3c0acb34243fdc2a0661fc4e74f7efe6f04a41cb6153ce114a36b4023b641d WHIRLPOOL 4838b97b4960ce62909aea940e1a2efddf1afa2fe9f874f91f8e25622900a7d09cefb1cc63a9dea4875c73aa327b3e49056c3792ab0a712d22f9c966439e638f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_es.tar.gz 1970276 SHA256 2d736a9bc64e28a3c6793dec72c01d89340c9d1176476a143fafe75be48a869a SHA512 4d785de37ab720ec784b44d129f0ab2c4228b306edffb27c1a9c1c64fc2b0a8d863a680334be2148be10ae14b6d27a4f4490ca6b254f7596a4c2be9f1a823ffb WHIRLPOOL 107534c38347eae374df89f653510de1256f6314f9ab3f17e039c62af23c939f92793c60b3151e6725a7706698f2f67e9a2843284ef7832ed95399a27ca6eabc
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_et.tar.gz 1380311 SHA256 f12f14dc8bc5877711fb6e0079a8eecc0602410c32d1b59cef3e8bfed4669216 SHA512 3c06d621c2dee1bae69d03b32a8a3374a5668db556207156b4e56c32ecc7f862fc31196cccbfb385d9b5847e92e93614d6e3e2563c61f3459f1c18c29c2eff71 WHIRLPOOL 83c60b3d894a967bdca08a47749b4e83627d6b7210a1adfdabd149907b1ee838db9b6b60872d2a418217ab24669f470d900b0b94c86a1b73f745acccbdb11777
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eu.tar.gz 476345 SHA256 3874dc2c0003fe3c08cbc5702ec26faad80b5b19d50d1937b69163a383a1aa3b SHA512 b016d57eb205b949471897dd20ac17514f51d0524d293611336ed529f888746d2596859dbb2623e6b8f9f6f68f4ed1cd7298f21bca21dceb1bd976260ae4292d WHIRLPOOL 2df1a70f87c6b20c524501327989fb92e512325284cbbe2d36688ccaff3c021d3dddea66bb5341abc1edad13eb7f29a94d4488d0ff8f579edd173dc949724c12
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fa.tar.gz 499015 SHA256 23b7a7e4add356f92340b487147c85b9c5cc1520f14ce980223d57851358a658 SHA512 9f3c92071435d4bfb4ee654a0ac74621294fc73f560706fc9a1834a2c430b2e53d1f52fdc0fe5869aec5edb4cc4bdab4eefb290b24ca4db0287e4413d818fd6b WHIRLPOOL a6b360fa641e951de855515ffff233b4d37b3c8e8e10a5eae5a98e352da1656a29fbad97d8a365c656dcf197a24b6d2d50a6b3ac99ce38352896ac52e14309ba
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fi.tar.gz 484963 SHA256 86d4f48c18cea3c1623e48956baa2c1756b2586ab6fafb1f52d07a931a540eca SHA512 7f42549b19005887c5414922dc96dac39b2b8d33feed68ed2e1395fdf0fbd925be345eb1ff0a759c7dc804cf2f0e5946a4fd0db572563d07f84002bd6e220c13 WHIRLPOOL 0beed077c5e585bb58e05d829e464055194f541b8fb0c87e44390b6f52716f23b6540343f1a3fa820bb1aebca0db61e7d7d30b5453f3ff528687f1c5da40dd53
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fr.tar.gz 2808932 SHA256 f5b9ec234b540b21df4cffa12cc5772019b7cb783363a024c4a4982c02703688 SHA512 e4a11b03f6861e4946627af605eb045dd50661fc6eedf1ed4a224e0da63042628b826498a8d6e681f3c35949cdbd01febfaea077c26d5ddab9df827e1c38b338 WHIRLPOOL 594b8c15d8267cf83feda79655793ccba336d9277466d718e2c2e3879cca80bb6fead3a2dc95b3e16e8e31408e2b3f7e46987362b8d08e8766ec75df4cf4ef8a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ga.tar.gz 494594 SHA256 a71961f7ffea0257fdf8c790f799fd6c1884c8b13af04455ed81dfdf5844a563 SHA512 922a0f86b86a728a96e52681195bd1f5eae576dc6abe3275462572e0b169404952f6245975ea26abc84939fbeb736e07c6eaf5acc1cd45c371f882a8c2ff9830 WHIRLPOOL 164aeb5f71c324c7af2e8a167d8f0aba5980fcce61d0c0943cb96a4870d4867bef62965331663eb801539f6b58e144092e0ddc7fb28b3922c21657851f9be318
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gd.tar.gz 1400581 SHA256 7eea7434df721907ce3c1c6da2b9dc25ed8b717d9953837ea6cc78e549ba2336 SHA512 a9790a9e4c904d327a36ec6b00da322b6f33bd944d90f59e6ede2eedcf7142a66b400c7c64b83a68cf04a0257d35b0f78001ce12645e581f767249c1b463ce12 WHIRLPOOL 133a64c8889a766c433f95b7013c6ea6d1b574407b1e72f79a9abc055498c8307983e63fab4799180d66acc028d52bbb2839f37c3f474f3eab3e2b83b3a1f274
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gl.tar.gz 1044641 SHA256 84041e7bc4ea2c81fd56faa8c622e147d5819c3e62191bcf6aabfdb33a284596 SHA512 9077da956160c6a6a7a54e0ea9520c496ab26c928d61e677a95fabe4911ab73880addaf76c63953eafcb14caadcb074e063e279a145bf92fd311927c3e983019 WHIRLPOOL b4efabd7698345cb5b11bb9752a1fba7a1331a7eb915a2e524f7f69e4bf98386220909efdea4fade5ab956ff5f02c676a8a2144fcc32144089bdfdfc39a20b99
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gu.tar.gz 1178674 SHA256 369d8ea99f2ca206b2e1dbc312a17d3cd0bf2c98ee8e74f9546559e5b728fece SHA512 38bfea12e0c5069a54438b8c3b94134d797453ff3f1289f4945526759884f4c076b58676da8792cf89bf268a7df16b628339420e4a2f47b39eae58cc2b1fffc1 WHIRLPOOL 56c9e98f022b1ac97af926e3c1da3abfbd2e830d80df062f5429e3ab180c20b54752f29b2dc7e848af05e5fe656a578d1f9130aee234e8bd94862ff0744b24ef
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gug.tar.gz 491547 SHA256 47e94b889cad8c94702ab8ea829a4d19c085cea2d6efc88f889c9a24595c4c60 SHA512 75e27841c1cd6d01595eecd1544be1207c71c6dd567bec8401d48f725db8930cfd54da8d82e96d9dc5d14384f3a5712776420d7d26f55ac114c68cbf66574baf WHIRLPOOL 2e9d0ee7df21f0d2448bd8ef0500b04c79cef487f0789d231f9e6d8b72af8a1eeb1c2666cf31bd8fff139c48e52cabcdb2907f152953847fcb0c6afb22ca1d55
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_he.tar.gz 1572223 SHA256 dd48ee63db6fa797d8e4787fc67c604c0eb8248594f0c3f74c7527b4722b0323 SHA512 74ae5173a3fb85e54b98f5822b96ef3691eb3eeb063979fe54e7eaee3bf2e700df53d670266511332058861bda1ddf024512d02f0df7f591cd614d29dca5470c WHIRLPOOL 52f378bd4379c5d3f6e16054ad9fd4c54bf132745b77e2d3cda174d87e2106e69a69d008a9e0907e2f76657542bc62da26a3255a2b04593e84b8c3255a02bc67
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hi.tar.gz 598634 SHA256 4523bb20d364b11016282fc7424c2831b635ff2c2b483e0bcfa0df37fc12f509 SHA512 ecdfe1a1ce05110bd07c862ab37269a22f0e433e6f06b897d91309fcb4027bf709dffedc2fcf4b6ee3e254a4e3e754bf239857482fc3c6ca8a6ce34966fa0a58 WHIRLPOOL 8c41480a0a770a211b025d8b2042481e4172b0c816b9dbe55c3d97dfb5d4afbf521b2edb39f8cd1abf7280ad6b84af5172ba7270426ac4a33521f4ec09fbbde1
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hr.tar.gz 1096282 SHA256 f9c01d8b21afab0ff8e0797ae49083964a7d4914233caff27ce6513b9c634db9 SHA512 1b26bc0d7a0347f662210f7b33916a07ffcf05168eaf81f2e4d2f29c4d34d8a37ab7c50dc26e7047e6ae6d90cc567a55c21b883cfee9ea782342f05b4cb56574 WHIRLPOOL 28d04eb0fd265b43389b3145c331b7ee0cc3c37562a6855c4e8fa3ba80656c08c42823e4a3d9410a0968f9c4fb8d016aae77123bf1fc5172528439a37b0a409f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hu.tar.gz 2704126 SHA256 2509332f43ba1dd9099c48bd5d17a63c328b41828396cfc2d1c2c54ce1d2a97c SHA512 4975d848024a348273d16cb04f742e4604ff5548e5ace95c799266b093797feef5710efbe6d99893fda31781f4ed68f43b0a1ed91dba6d60738ae2028012522d WHIRLPOOL 026592885ed7b5c7a5eda8e25e7db9e4350737e4855e575d0d0ef9440aca261222a72dc013db13b4777a5d3f722587d1948ae81894bd4b59496072c818ae991c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_id.tar.gz 469514 SHA256 23fb6ddf819b780ea264bbf5eff84c93399c6ee907557464a7f033dadc262783 SHA512 236a59626b008053989465bacb96ea6e6a145b63d92179b843a068f7c40a79b0b81b8f8948abac8d6e929a17a3b14aaf150dd14429d1cc0dc1f45f23a9ae9805 WHIRLPOOL 8e82a323833fa71a3c038d93894fd09d9e4f4dd5fc8a07d3371ca04b092389b20de30a74abd336a85dd5d20609812f346fffa9f7a03121353792a0ecc298921f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_is.tar.gz 1280281 SHA256 1c5410333c4efff2cbee2b80f651ecc2e893d8837c5abd5831b55f5ef90aa658 SHA512 240c680c409b59dc58e6fa1c00b58f69212038b84cf84eb5379449e2c069178bc9f2a1ce62389872d816d47c58cc0b0878d7ef0367e6bca05c327f0610351c7f WHIRLPOOL 6ef9c6fdcd85806bf568fa802745a168622c11acb99f94221af752c7523eff9558f48ca3f80ddb494b3131a5e75d336d6379843f1abb4ecd04a47f910f887111
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_it.tar.gz 1816328 SHA256 00990708633ae7380f9d867fa91ab19017abf8c5370f1d5550de774a4bf1704a SHA512 94fa1a4ca48e4d5d9b8036f95e79a6359747a01e0f09fe55a5e50e93a086fc3e08946f27e1b361f92539138af925c9b286837cf14ae53305c620b2a91a7c1daf WHIRLPOOL cb237ee89929ad24b0fc2433160c648b2f9f1efad253ebff0cc7ce0d9af59c1220584b3b00e9b851fbb63ba2b93e00d29b369f5d398c7a597960d04d233d5da8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ja.tar.gz 577599 SHA256 65fb81ff16e7066bd30074d0a6a872a0c6347e8d9a8bbedc5968b1e908ab4a85 SHA512 249afadeb873d3bf20ffcdd2057d55c5984ab0afc0adb8edf182881f15e2a025f72bbd45a6f0dcac62f85abf7448aed5fef593241e38fac76e7f3fe2f76a3ce9 WHIRLPOOL 8c11d680634aa18e9d751e269d4baf8efaf04a9f4c2a712e9d7f990ea1e1038aba0b44a981aa8a4c8334647752c367fc3d841a1b169110facf67a9e597d76413
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ka.tar.gz 510827 SHA256 08953cf425119cbae99e943edefb05b7ee9c4fa9eeecfe893f66431d1d7c7ac3 SHA512 1913ae39b8442c8d9e4554d97b2ed343db27a3ec5ead5e7bf4309d317f73ed7dd86676782b8c54a70c3a581e60544fce380166e23769ce276ef58298b342b1a3 WHIRLPOOL 3f443e615566fba3504bb3a6a4ec2133f3e1a5fe534bc29ba1e4391fc2b8ab5a253ea3cfc2feed11b987a7967c1c88494c0caca24a6016e86329fc9a60889155
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kk.tar.gz 524778 SHA256 faf402c1b8dea4ef25a6605d36b57ecf5d183014ef344a8cd008634fa5bf25b0 SHA512 a242e08dc598997aba0116d9eff20c43f41e4bc4706175014c6b252e5befa6d8528bfb6bd867fded8fd931ca161a101f023bf4e6ccb965b7f4ea0877700b5451 WHIRLPOOL c8c98bc18cdef4386627d03dde33d246298235ad26de69cbf8fe993e4c01a29447591a4c054ca9ad75c51020b4559c7a7f31a821b4d43f91c682abc8f449a4a9
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_km.tar.gz 630610 SHA256 40ca41cbeae4acbfab975ef15e10bbe3785484b765a1dda9dc25c12bdf8a1399 SHA512 e9e9f58dd7e7eeb69df61d48f092d9ec445e22f342f92bc4b0216431cc87567472c36ac1d74186be0ecb8b0b1a022145a658fe2bb2279c6715f30f60a44b11fc WHIRLPOOL 464d4bae4cb199a0f3ee670b7a2ee78889b545aa857a797d2f96e9d04071b8ba9c2fa631dfd336f85801666ebd1865a47aedbe1c840388781a69b5d3a370f800
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 486373 SHA256 820c2b8da6d8326441e65a46b9f5ec0e4ef0ad7a3f6a2242aa7614f357d1ff84 SHA512 321c010547b111a90e53273e9d041ee3bf327a0554db351f197cb6a2864d697eab010f3825ea7d1dfd453e2db46f22805875c1be61793871f4b7da0c2bea5f34 WHIRLPOOL 3027bb63a3050f4ad6de684c48a8b55cbb89b5aebe024f2abb516d0d1c70a40118755e403430d9b26cff2ded0cf4e309d6a2ba39a1caebb2d78d0e12dbb5111a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kn.tar.gz 547325 SHA256 b90363bcf61b441ab009237bde3b503f039ac774acf2ba4b915657ac5e49bf77 SHA512 c04c9f13aba0e4f246d72e176125f40c0d4c2bbf68fdfc7547780e7b67623be67f850d8631c94d4bc0ab4ef8c1c89a30ac7f381272ac10c99a0f5fb95bde1fdf WHIRLPOOL 86af1a1ffd369b9a222c2d248a7d9bd84dba4b9da1267701b2d41ea699d320774995e92e9951818bc5ea289e7f29dc37033ae4f34bb0037d9dbad460af077551
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ko.tar.gz 572747 SHA256 0a3112062004e9f5fd6ae30cb1b6c50e43d45d82e8bf4fa84190ae188ae2946c SHA512 8a5f4eb27a035b19d38bb67d23f88e28decbd81ca10c6a00a452c653f7917bad64b73ee8bbafb5885f62f311b0c1ba6ebbe8dfd7c3ac4094ad85b0645eb8d7b5 WHIRLPOOL 731fed052954624a011befc3b25955b4a8b1ee032502ae47e93177c38987edc7fb14558715dbeaaf566f275df3773f34d4da4f87bb7bf9df44e84c39c67de6bc
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kok.tar.gz 526412 SHA256 b4f5d5565948d33f49045b02578444c09cf17e033c7425ec1b1c160cd6a4ff3d SHA512 9330f808a4671ce7f50d2688f64075cc7f2ffe86c0253d53f0e9947f0988c272263eebd4cb1d5a5b78ec8067c1063aec4d5ae267359387691a34409e38391d1f WHIRLPOOL 81b63614b1f09dcef10b2d5c04ae45f48cb64fb942f3849758002f6a3ee4abc04468c4b4fd34468607ac3622b735b073e7b5114892fc39bf1bf010362914bacb
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ks.tar.gz 506207 SHA256 e5c615e46099c08bb1128ca8e5efa83171a1ecfbdbd490bcdc2380a28da42678 SHA512 b39b5007abc23fe7fe9e76607a9c28644d8c5a3964016d1bcaadfe2bdac54c4bfcaf80cfebb06ce26859672d33bcee814cc644abc93d5c0a0c278e605c4e3122 WHIRLPOOL 3888d29e6cdab9debee06b8dd50fe999c611f97e42df0c24da713d4ebe3059048208ca812840bc7d0d5b7d75297fca713c1a94dc90f186fd66496ae72aa5e7d5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lb.tar.gz 451989 SHA256 01721326411d852f0391db2053532eef35a4563b73de806b53b6597f4418e486 SHA512 cd0147937d6e6a464e820f2f73705e9acf7e2e0a858c3da1ca41cc2210c14085770c4c6448b185de4357b8aded92441f6cb492cf57066115fe779dc5ba89f3f6 WHIRLPOOL 7d79b2bffe2229723c8f17b718b0cd03426f1c90a374564ea094c0462f1d401eb0cb38098b270be7dbc7ec63ccf957b06eb1d0200114029b577580bd683c1db1
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lo.tar.gz 549906 SHA256 0a5e0c128e3fb6c89933d4116ec19a1377a51411924121c9cce14639129cea41 SHA512 015a92196141cc586da7d814230f38121f7fe7c943ea7af1eda5202e1fea337031d805bca35572ede59f62b52a6ccaebc03a158aea1a44439a24f5853066578f WHIRLPOOL fa9508876bc99739796ffc3a8ec6bd9cee61cb9844e90812a1c05835941f96f89e1656adec46d4476a96475e0b2218f031597ea7defe48ef029390eeb5b1dc6f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lt.tar.gz 824568 SHA256 6499fba0ec86efd308faa46e1c26b09b59ff728161e932e2de1cdbf0ae522dc2 SHA512 4bc62d5d99a95f79562620f8e67b5ff03580e014525a74a2e3d89a413e9d4d37040c1fcfffcae74b944dad61692cd94a5ea5bdc4b8c44125aa9e65d37a02b599 WHIRLPOOL ea2aa328900f46924b0b54f3eeb607fbc4a6a9de91e1d6ff1a7823ceafe1e0d321a34010ca4387a1f71c2cfca7065e05c270f019989dba06e4185d2fa621419d
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lv.tar.gz 1241539 SHA256 f69d4ffd8a8f93a9ce8d5f8971b2474d2ee25963ff037d3b29a8d8230fd0f69b SHA512 e667e3345a50e05268dbb722cd51f82221b4cba5bf2bdd42b2f64f594aa486b0f94df7f289f5689576cc9695fbeb74c20f045b1144cbcf868fcca04316e0f6ed WHIRLPOOL eadbe21794192ebd113bbff9b59bfb82567275019e266a0438412d7bed32699aa18c4b30ae2e8fd04c3c08db32024eb896607773b1c6a9c089d1da594d3cfec6
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mai.tar.gz 508259 SHA256 e74d315b4b82f4510a8680858e892ea9e7eb2b48aad2fb28c5f815a9d89deb7d SHA512 5aec171d2371143318340702cb7bad150b9f0783c80af739fd7c9636bbdb59be288f0da21b9df544d76de32bdedf9b293cdcc4e57b0888d310e1b107ab2e7471 WHIRLPOOL db3a2e481cdbb5f5b993880263f881a1a08dfa507b9470c4e9c75dd7b8695ffc48eaff60a5b019f18f9bc63049d4bf6c22dc6175a4d5aeb7829647148c9f5616
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mk.tar.gz 508837 SHA256 2543ddec5104b2062642c43faa026a7ae3ba890f61122cb4c6ffa94503bf911e SHA512 7aa28977f4eb39ad77fcc57ed6974655f286cc5231f3d5ded04014ae28b04e8a39af5b8f514e69e3c6e46b1f4c876f66ef4cf12921c590a1c81c32933d4a58e5 WHIRLPOOL 692f0ecea0828824b583c92f3d20dfe4534083c25fc3347438c3562e8bd52ef21c0100b2af2e92ebe267a729ab3a79c56657bdd2914546117af938748cfb69d8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ml.tar.gz 547641 SHA256 e1ab024bff2f6d755242428d3f67bdb0f41e2395f3f23b740e7d812e30ff5249 SHA512 cb369777552a587c3d48d469bbc84dc2b281f5464c2664a8ba3880da2c31412bec8b7753c98635b88d3616991622ce3b608ac2443857505c507529bc682182ea WHIRLPOOL 8e5f58cc0c94d21e58c1e84afbe38445904b81844c25f063bf390b385a8c28c7a0c8c7ce2092a84b66710c1cd8917ec8b669da42b5ba845dbba11c40134318d8
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mn.tar.gz 596436 SHA256 ed5c9e72dd0d4a204738f8b0d23536e340c4326523ea7a4104ef42ba2abcf5b6 SHA512 841e13d16260532dc836f7f5065d0cec8209a323aaed395e2d4a2dd25c4571f60712f7ca68d85d620ca49484cc57701b3e17316385ce8b76f28112a6d1d541ef WHIRLPOOL bb2ca157d0d0c53032ebb98d13ce570cd73797a7c9bdc46c72cf7cd2ecb016ea0e6969c8eb46b6264f49da16217766c5032efcc9a5759264f4f1a2e596f8bd00
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mni.tar.gz 519517 SHA256 7d98ccd322d07be0d367c00a1cf8fb780429e26e17c75712c12e8d4185819417 SHA512 6a816e0ceb755b91683535c407ad995e2d62153eeaf260e68619ae17e6499d092bbc6729b5ccd59a8affee44e9c7792b60e15e420c16da51155d12c2bd0b7715 WHIRLPOOL 2ce02a16fb9b0c9001e9c1e52b3e3d8f4ce79239e48decf83c480a75330cc11ba7a45452c8e1a6e481b15aca8119dca79f902ff7c29d69dc5db357506a8c9cec
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mr.tar.gz 541695 SHA256 8fd02f8c3ec6314cce3d41aaac5ffc2eab550b24c1e9045b595608aee49854c5 SHA512 6da09097f2c268f981fb6cfeb513ff2090755e6c5d1d29ea4ae3ad6f52d9b00ffaded4ed4e7d288b2fdaae92eceb91b1306ade0c23e34958026df69bb006e799 WHIRLPOOL bc7b3c4231843f6dcd2682635b988ffa611296dc005da77e67026604633028762b049d98600c6d2e75fcd39e298c70f0b6b52c330f70c4ca604719b9dc47778e
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_my.tar.gz 538950 SHA256 ba1a2704755ba35823bb76c19f7c90b88eb45ceec691ce6327198918011cfc84 SHA512 8efcac3113e8ae4e4864e4cd2a3e8373e43fc651d66e71b456ac3e74a300b6be4fa6615a4a0100c55e4224e024b074de653622e75cde844aa4299d88b778a745 WHIRLPOOL 901af20d17aca50bfd84cc0e900e36bb72fb0f4ec640b9f570b7806a0d4e0c3a01b74d21bf5048223880b608952bb8bbc9a75a45eeb74ec0ac11994bb7dfd6eb
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nb.tar.gz 3473346 SHA256 633902a2281c6123c9491aa0749d002dae931aefacfc7fa28dd043719a54b4ea SHA512 47e8565f25105958bf5cbf27ff8ed971be99efbe7aa675db8af84323d7f4965eb7e1e1a11c39b552e067459fb1e1ba9ad7a1eb47a71704e41919d54ae4673c1b WHIRLPOOL 601913c4acc86d6c31ab6e79de1114bad4b49487b19d6c72f8feac3763e542e6b09e42af9d7613f43b351f9acf032b1b54043a688c458c814996f5b964de5a4f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ne.tar.gz 908666 SHA256 2826ee32135dfc1b6e02f6b5eed3a5ea8c9bb40831e31aabb8d874c0bff93df9 SHA512 cc3b933b7ba3a1f638b628b4d4658c1efaf824733df3dc328f09282b470efec0db876e0365ef403c4d68d78ad3709d619f038ecafd9461ac6fd68f1541eaf203 WHIRLPOOL c6e5b91d3275c91bdeedd1b3cc944476d56331a62a0cee9439224fdb25c9480f8dd3d77ad32b158e2a65a27e3ac0c2cfebc6d30baef5aa15e8d1d0df4306a751
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nl.tar.gz 1273797 SHA256 100da9fb0b5e6f50741c8b13c129776344ce5b5e57bfd539b183ec415e49f9d8 SHA512 c9e6d8864c43c56dd5cbdbb85981f4e683e8b969c2227fbbaf0417c11388b73376898bbf2a3276f04dc2d3b77f76987d0e3fce38866d1431cb3a37adf121b823 WHIRLPOOL bb9c79fda04ebaf27626afd05a3eda3fc799b88ef4598c54cb61c0cab8670fb03240581503e188996eef71b7aad56f794f88855a038cf0afd6485c73b012a38c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nn.tar.gz 3472241 SHA256 5b5a13bef583027abd0765803147df5a579aaf814ab593772dd628dc7725a0c8 SHA512 8b29b43d7d11768cc05b472b6de145e2b97479747848f69c1679f7d0db97c2f39ad5aca0dec3cf0d200f10f102a4b155de04a56459aac8d78b98f0948e986bb3 WHIRLPOOL 351cc72339b54c57eabbe7c46c613815196c6c15f93950d9d1ff0f4f0774ab70b5eb897dc3cf947c2c3124aefd1794036c7b9e4da00da4475612eeb38fa87568
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nr.tar.gz 485989 SHA256 b129def116c80121dea4f7d03b45f13234a8984196a1a208b3b977f83ac5f8b9 SHA512 18826f335f6824b367c1fe3a0fea7a0a2f858dc86728e184835353b0cf54aaeb9a44dc325756c8bfa5d4e4c28bfbb802fc821c13bcf0e294342fbfb5ce93a4d1 WHIRLPOOL 79bf1669ae8a2113be9a2ed206cc107b203eacbf04e5fc5bd8471dbf4af353738692da60994e835775708d1773326785f1b5b3ed7f1dbda7cd7b2dafe158f882
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nso.tar.gz 483253 SHA256 71c43fea213fd614b6582f71ee6ab2225b40ffb4b1954bdb5cdb51967184ff69 SHA512 bc8feb8fe660730015d9ea4b425b8cd7227e9f9343576779ed85e34a789df79df5c134c93cde216661a988a1342278f492112ea1833d3437e561f434964bfb9a WHIRLPOOL 08a7653863115d852b3299c37a08f625d872d3319d5fe71e5d654f3c1853fc388cc8122828b39998fdf689713cfcaca1dbced940a8d3257d28c03086e40dfb5c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_oc.tar.gz 685660 SHA256 f3fc386612ca6a7e23d9985c95597839c81544b0855fb5676e6746bc8e857389 SHA512 574a940f3394ef88c30ad70b3dd7748803d4775e77db636363cc7993fa71d9982ed24a25aac1c1ca93e5438ac3d7156316b62249e7548623852a60200296902b WHIRLPOOL 6bb0ebda6d2bde4d5836054150fc7cdb300b2df7deb2cf6148a334a637f89677ad9324828dc244cddc0c996b687b376b4657ab3892a3b835274d5dc3a3842c16
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_om.tar.gz 477060 SHA256 7476c1f978591ea24355a40d9334143a730038e2ce2d1b523b60835d98dc8651 SHA512 697fa79ac6fb57288b8ac3c9a24b1fe220b60d8a11b4014f58bafb2bed7179a15484fac45e62b790d6f9f56165f847d7ec92df3ef1a0bd8aac52ff6c8f8e499d WHIRLPOOL 3050e4e93e4d39f51ce5b7cad69e71f3c715ff678fb71d041c604e150aa8ea61f60799f6811495d99596d62b024ec115f4bf7a8cab669f50aeb8a6954ee58b20
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_or.tar.gz 542574 SHA256 cf8e66af3ac3d3ac16d60c21299bc825d690e63c7e7d33d027b5b6f145684854 SHA512 4c9d81fc37f8ae85b2cc58cda92360f117c46c0eb999a104d8ed0b55c0fefa69150ede0ae7e1c276cc1c6426bcf420317bbeafa60af8a483858ef684a3db2db5 WHIRLPOOL 767eb935dc4bfef7df1fa29bf10de8ff43c11cf0ff2975374a516e10ee588ff930422268b95fd543a5f6e9014a636d188270663cfa13b8273fae5ece7021e621
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pa-IN.tar.gz 512906 SHA256 e65237f1027d9178b2fba1ad96d9e89617035ce0ff528b67df0af02ca55acdba SHA512 1446a4d72c7b443554458d83ebdc251ff92e2f8a31436d61afdaab9c10abdd18adaa0a1a5f0e23a6a45b26ffa0a0be378ca6d5aa9b46b90ced59e926d02c6041 WHIRLPOOL 0ea3bb2986773eb91a701f65998d75e0eafb949d165f7c11ba2b77bb247ca319ac795e46ce19084e5caddeb8515a34e312577101a020baaa9390c72ac5a44560
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pl.tar.gz 3268604 SHA256 2f80a7bf042b595aba56b1fa9316b4dabff24e5e740ab06e7b87f8332c5ec553 SHA512 f0f4acebbf71cc8f4885e745c1bce46c34117233fea19b07a0660d57e431cc957a5c56e0643e049086fc8a2032326f415e40438e6e2d8e0ce76570de4f987ab3 WHIRLPOOL 326b5673145b0b40c70294fc37a56592b7841fdf97e82e926592074228ff01e20d336a14cf0473fa9a81536f5196dca6333a6b95c8a0ba652c09c279135875f5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt-BR.tar.gz 2565961 SHA256 c98e67445c308b453fb1687196d877c105fcb2db4abc92e1e5151bd7e4d61c34 SHA512 f3edca61dea1c882b05beb8140cab13e0be83f1566e13d93462841c8ca5f0ee9de7162b082368efcf7853d85927ebd8f52652d7dac5d86aae3e8035e00bd404c WHIRLPOOL fa240c5a389f9bec6842df36538cd0b3ce284dfcaebd94d489a13e467901544fd1bb870a0e383030e19acc68aa87ca31e3ebef03ba390b419dfe126e54f44343
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt.tar.gz 2119812 SHA256 c8987ef5a8f5d0991556b9b2e58ec8180d027f0e81deee11ca06076db020bdc7 SHA512 c248d1af9525bb107a380caa2a960bdfa963514cdabba1c09ad25466ff1394a90ee15ae37661dc57c4cc01ed0cce0e8470c2927252938e91aa23ced9f6eeb5a1 WHIRLPOOL c6a2fb5626f20d9d775bfd0a7f002d6edf7dd59b49626e3b2300c55bfcf2046db793f6c42f54c9bec844ced28b29893fd1d4772db6a5bc014a1ea5e4214507df
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ro.tar.gz 2352485 SHA256 9eee9c4deefecd73845d22303ac738ca57eb246b641c6710983a97035ebc146c SHA512 0fef6411f83688644de75a6ecdbb3a92e11873db9cab73eaa0be0e5c626c6586755e5834e460a75689ef39b166a2035ba3c7520eec247841fcbd3b470fb7c1aa WHIRLPOOL f57295ae04be2ae6b4797bd4024b6a232f1ebf1e2a276a987e88e4e5c97af70cae24046a84e7405d13fb0ce5559b4baeb24b6b9aa4ff849c109eb2294108781e
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ru.tar.gz 1638916 SHA256 caef454d47f8819d1fd149b0566b87f4995ba5d16041d42a45319392ba006e7f SHA512 ef7e34bf31b6875f1f6cfb7a5517127ef938c66a736a10624c18e54de652b580269998151ae1fdb9b42cd92db412ee6d0597e30a2652810a86623a49d9264886 WHIRLPOOL 9a3f3e3360a7a73a37dd30d57d794ade87899abf39164b1f46afeb9296a5fa2d5cbcbb6a3bf33a1315001237350a74a4157e0a9e8bbef3aa16e96806f20d4017
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_rw.tar.gz 480258 SHA256 5b900b837e36dc61f5f215f741141b4136788957ba1d83d5917f6392d864fafe SHA512 08d89d02d2a0038440e1a8779fb294bc62cd841cd13833d96d06d0dc5450b3509042b101d3923bce033680d73653dfe148e954c7442990f02f7b7c7f3955f6d0 WHIRLPOOL 6170c1fefebb69bf42d4606286d586323626172faee1f1ff49df05e882ed22afe3992b7ea4bbe77a883e26456f5d233d2f0e7973a3a189a5f2d4ced7d2dd8487
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sa-IN.tar.gz 528714 SHA256 56689e518253cdec284dfc05a0d9f43a05b618b1e8d8583d4fb227b9f7f1e050 SHA512 d095c0478a935474e13ff6eabddb8b1e7f2fc1b79bcc54b1730c62b70a67bea9e92574a991c76ea3b50427054b38a1ffbffb06c9a5516d7e3baccafd6b640f4f WHIRLPOOL d6b9685bb4f3846df9b4ffcb080d122a54559af2ffd82fc37c0bdef819c9fb9055e3a26b23894b38a8bdc2dd0a82639ba41db5f6f04ef4b3f5653f9e92637d69
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sat.tar.gz 565322 SHA256 01cb04d99e081e703cb13da1cd77ea05ce2c3e83171eca3dfbabbabd4e906d83 SHA512 34527dc85044a51cc569402de279fe55869af8f431a30d12148ab86cee4464e7c38e9e4f32a59aa29c29e8f1bfcf6d5db032c35c349cc7de65da374410d4fd30 WHIRLPOOL 29618013fb394eb69121e1343c7ba1016817f374311fb53870b0baa859f5e5576f5fd0a4ae0fe1262583f5aa0df9146793edffc02c0c6cbf04c4de8d072f6a12
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sd.tar.gz 520560 SHA256 b111efcca556094a6f162d16758b28151b73f37144ecb2220ad2525d206e7a4d SHA512 797b75bc22dd072d6bff77ca005bf7bc2e0fc9a826f5291355aa14aeb967c92c4a1b1602f3684ba37541f8632e048f0f09fe1720bbcaeeb3515daf1db0f9cc58 WHIRLPOOL a9727dea00c48c7440c00697d616edba6b208d982919ff366a5291cc3db70ea7b63b3ec71560673b9037d57727a4b88e1e8f7a9c0da4d8deff5304a4d5e36903
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_si.tar.gz 810471 SHA256 57203033c3a6099f804f66e6a69a301238ca10b74b7df7424fd3ead7c429aee5 SHA512 4677d1adce32e2afd9011eec76e005bd4550d3a5dc74b5a8bd58f59d0658efe85e587d7d9d6f642d0787598564b21d32b875c97bb21817c56e29b68a7622733d WHIRLPOOL 3486ce73c8b0b288a83ae461ba79e57564ff569ba97ec37a994594423feede6772ddea9d00374ceb7a998217fac4de22ddb42f4b80cec068eb2e19bce25b610a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sid.tar.gz 483142 SHA256 1450c9173ec10098a10564546401ba09a3df52e750512155e3855b6deffe7ca2 SHA512 a8afbbc66a60a90b284e7e3720b1720953fff13cd5d95842fdc7b12a3b5aaa06732e395aff4bd9f661e92d5609eb46ce76ce41979b8ad0fc98c048829025dbb5 WHIRLPOOL 92290eba6729fe6d3f9556490d2392ae4339a7268d59a714da8cd73032e2b94e2b6650fa90d4f367a9f7c93017cddb568c5e3f4d8e596941524663a634eccef0
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sk.tar.gz 1773712 SHA256 aa2a7c57260874496297028abeb344e9a0ce00816a9c1777c45e9a6d0d8cdffe SHA512 8bd2fb92b0bc02841adec2c8c56b6cf83a2ddceb2e1ba7faaa5d30a6f0b7b22d6b6fa292299857f0f4b7f6064012e68bc637dcfc1d8810ed4fab7f6d5b21b81a WHIRLPOOL a79bd51f49a8686d3a1633b7080beca090a15ecc3fd25f2bf7a5aeb5ee1a38e249bdb3309495e3ce22bf87a39ebb915634fb2766acee2d5164f12f450fd8b1a5
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sl.tar.gz 2151569 SHA256 b93952c936ad5c4e57a1e59fc5aeebe5ae8500364269e7cea61d42243e4c02b7 SHA512 d6619a29f801630064ff52050586d4a7b9b0e083ffaf3925fdcc44692e83bedad4fdc8c363675093abba6e511ec5d7d238ddf30c2c98c97c5008335834e85c06 WHIRLPOOL 04753d0863ba7791970a78ea595508cfc472733001ad782fe504141adb32dd6b70c799f6c1a813f5e8a196663c1f7c906f9ab5d0ef0250f320b6c7de95faccb4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sq.tar.gz 497194 SHA256 1d1dd90abb906f11255ddc87608562f2562feb35fe5b7c77bfb56a0fe56ede13 SHA512 9e7f946177eccc8e9ac4d032667cb3afa3fc33b47f0df20103a850c2499e9bcdc3cb509e002e4ef93c547fb528ea7414b188ac9c65ea6c306c55064c1076b256 WHIRLPOOL 63289d9e9651c9ac0fdf3a3b0564d4767b8c6799da53127daa29f820b06fdd0370171668d491808c2583b92248460fd180eb3de5b2e42f96833460bc8afa3c29
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1668524 SHA256 1104a221c98129822d0462511846f0eaf99a119cb434fcf17bc3b05a85ee6139 SHA512 fcba0d2ff0a1bb312685a8625ae8836cd355f7cc3ea504b42979af542a6efd666ab9fcc3b5bca2c5a53f72f501d2979dc644d8576f4048191d95a1c033948060 WHIRLPOOL 236d858c853f0b2dd4ae6f1a95513459bbf3250e3a95bbe12fcd576ffd14d0043672ad893ab6f9c5eb60a1f0b9ef83372dfc5a922be3407b8a30dbc7079cbde9
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr.tar.gz 1695823 SHA256 a733c0570e83c95482a0881bf1dc0c91de08ca4a276e02f52b25ce752535f1f0 SHA512 3e621b0675d8779bc84e894b93a0a0cabaa0fc14906f8ab7553d3e8d2a8becfc40f760023ceebc47f5c83f7a8233962252e743531e53901581b3a2db87ff9d3d WHIRLPOOL d35b3d5f6f24d76d2a4d4df19cef1a40e56b159d1008f8f2ab2cc392b648b8cec23407def581d7141e03479976ddb9b55c607e9dd05ede1a880c6620a662c8b2
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ss.tar.gz 483283 SHA256 c280f40480025cf5997d45d599b21e8cb7379577aee44b448a9a7b4f644729d6 SHA512 246bd1ac998e83def9aec5f93b19ec5e78b482f839bfd7784e1554367847c0f1b753546e6f9d6c3a0dc281cb429a7ebc68bd6d553540dce1cd55fb03d01e9d43 WHIRLPOOL 16fade3cb3123a94f86eea8fa0973bdc27d71df1bfeed91a4fcb26249cf343e78d963f1bdfa64b7d79dce622a3af2377f923880433c903db38ebc286701d2f73
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_st.tar.gz 482927 SHA256 2865ac7f432d43048fa822ef6d09ba26abd27ae83ea9792e954fce47e6495066 SHA512 002d3caf39b17a66562bee2461a635ab95919dd55ab96373055f5c9a3fd8e23c7a33bc9e370806fc56c5eb5e1ae54e1b4080c99976bcac00e2d7557cb3f66cda WHIRLPOOL 32e7b8858c8093c0f96272f50613a99f2fd6fcef85b9dd49a3f6266bfdaac1bc8dac0e90dbcefec8a9c8ec7ea2f618675fbc3725f38b856a0e21eeb9657ec56c
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sv.tar.gz 2354878 SHA256 da0e9988104999040cdb13a6108123ae46d462e5871c8f4c1c3850ce4c1172fe SHA512 7806acd8e2b26472a6bc2f48f17dc801ef9f1d910888b8d93a83ba97edb55339e93a4023cd5ed268c4c85e339acebb21dc57b65d8e79c84e4ddf040def7c9414 WHIRLPOOL 6cee351b994f6d66d25d48ce65adfa3cc6b0a281cd61a54d53bfa7f2bcbc548091c0de29006e33dc166495d87ca7025728c5984dd529f813cfba404d15d22b48
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz 471331 SHA256 b91f9cced33f01414b7b6005d4c6a29107d7cf03fa786609b5f0dbb374cbf7ea SHA512 02d8e472029949043e040e9db5a38ab163d1001f93176afb2f2560be102552b5d0ff1947964fe470bb45b683b46471b1f73e78ba6cf687f75975e3c438caecec WHIRLPOOL f5016a17fe4c68bc9f4cf6858328797ddba4c2772f493ae65efa2728899d2a2c20e739917e8e3d864facbc226c081541c8edcf44a8528a63fdf15e41b35ba28f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ta.tar.gz 537798 SHA256 3483772723ea4c861ce6b74fc28beed81dd9db34fd3854b895d5c83f4ffbcc51 SHA512 c159456fda0fa35e581e38ec8f8f49ac9cc2220b5ba594b52ed9fd02c5b1e52c93bcfbfd3623ef715696d38bcfdad301f972e8bcc9a185d69acf9db9d3fed33f WHIRLPOOL 6afe9267ce25511623648b2069097348ef47cc1b674b1aa2d0336363dd7649ca8a492fc9cd1b4b350762ce6f957eaaa2fd37466b1d75aaec8d4fb49b9ccdc38a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_te.tar.gz 1092016 SHA256 dee612fbfcd4a496d97358740cded918f4fb13365bc92371243bb462b4f32769 SHA512 f51fd4a88a3a77d55438c082bef3ace2659e0c236ee4c204dfc658cf7ec9478b8f7ea106133eeb9a08dace806e39dc83aaa941ba64c3efe30c4578a38008e5c3 WHIRLPOOL 34d30cd574bfc4ba30a43fd9ee9481f947348a7fb97ec41d673aa7a96a8bf86c97ad44b6ce55269670996dc067705ac998be5fd5827b8ef0de6cef7a1c1876b3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tg.tar.gz 499534 SHA256 9f51e1c3c868f542a618a06a8cf311a2d33b0d5e59651e997ddaf934d3837e1f SHA512 84133af1ba280b5707f9dc3c9c70c8e6ae678d0d2a5aa3f3481604051c7ec44ee95e05f8df7c1c9dda2bcd86d1c14ed0fa38573c4c74f12d703d9f9bd71a20a5 WHIRLPOOL d8db7ec4e4e896fcf1b1345e7106d28d2681d854519d352bac40c5be0cc695c76463e29dce73aa2da75773d91d0267b23055869497bd15501168d08f292bf5bf
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_th.tar.gz 679143 SHA256 c78f3699583d9fe71b1f44d3a72c12bd1501e32ccd5cd3e6d3cfb4361025dedf SHA512 e8a60643c165246540599e3c2122574a1e79c4c51300c302acaf2fe36c725f187e7add7c12b90cb6490b115fa4c2dfb9ce82a92263bce660e2a4ac0af4ed3f0a WHIRLPOOL eec34d631bfb7fcc3f2aba07567ad4a47f5dcde6aa0cd2e6fc99d9926ab96248e4a569d5d400c9cf8b42bc750488d0aef23591579bec16ccc229ebca9a3e9361
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tn.tar.gz 474739 SHA256 38972cb5d520689e31ccd6261bfe5271e63daccfc685600cdb7452cefc5ce09f SHA512 e97cbce57bc67e607e821589df0b926c31527a22df759f13f3969cbf1fc4de9c26fc9bf9a2fcf2352c5a0d9a8f6596c383b1ff246294d9ea4b33bce45bf1925b WHIRLPOOL ff9b6cb7e0371100dee39a1c792184b01b2b4d449804b263b23955d89cb1e8325ce955a6607983da319f9e213362383312e8772581691b1d7f4f0f591aa3aedb
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tr.tar.gz 524400 SHA256 e2694e0c8606cb98d61129be0897111897ce377967c51c8318ebd1124781a0fe SHA512 00b67e4596ca1ad0dea577cef8ea485777123375a1ad6d3fb97208029c1f5109f7b15fc21321cf90499a278c39be9a8940ffb2b9034bf0542f1eff5189c1ade0 WHIRLPOOL 5709c3274abddaca2aa15d462cb45d46db16a3c2c54caa181da4ada7ee3199d751e0defa34dd3b28bb70c763d1c257a7ac34b0283854ed1ce7257e9bc10ad83b
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ts.tar.gz 483726 SHA256 0836e33eafc01e8b1e11f2ebd7f3494a39b6b5057f8b04ec673d175b15f6949c SHA512 90d064ff3b1b9dd2372decb4229c1bc95085c51aefde0e52dfbf7ebd19e16ae7dfaea775a771577dbf2cfba166f18ba8c4c867e31ecb397d6fe049cc498a5eee WHIRLPOOL db26109ff809fbe5f53f70ea278313b68cba8305f8430f7be47c48370fb6864de6f6084e5ffa7f7556fe6f33441b781df3e3a5dd98ff716de74734843d2a869a
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tt.tar.gz 468837 SHA256 b967042c04dd1fbb475c81ae6587e9eb6108ae39bb7a444399da268bc1061014 SHA512 6dc6d55c0e2a8c7c61baf6bac2473577cec0ca681cb0f7433fc1f42dd7b98a419e5b699c979be9d7e64ef3299b83c0ade739bc15fce7b16c2bc32ef85e955ab4 WHIRLPOOL a6f96e1c4a5eb182e60a2dd4a85d9853674641e3ca3cb8c9674005783eaf56b2faad89810608168b4f774cfe48500e885d291ddca6b2507882204e7087e578e3
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ug.tar.gz 513664 SHA256 4e5369a7ff93a0ecc6462891c942513379f445751a68369d240bd253c089e11e SHA512 ac99818e2249577e7be9cf24e2091ab6fc54d01f3bfdada85b5c3adfda808935b3201963d33515387af3c8fc318c428e64a2bd8043085c2fb4c563fa9edfc53b WHIRLPOOL f4701ef3df280585388a1883ae043d2ae8f81d535e4d445d7a4f8a472c5e0553cee9d4a5aae27c93d305de1418b74adb38b2dbcedd59bdef11c55e39bc09592f
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uk.tar.gz 1361497 SHA256 56d73dddc12721b56a8bebe6330282e4a60bfc08d549f45571f616332d564029 SHA512 327377bfbad0e1d68c77c42ef84d6ae33fa7526e37c3a12464307e0c175bd13465ba0cea6a076d8ad02cf6b4751012bbb0995eeb12b95dc0f3a8dc0db53d215b WHIRLPOOL e6aac31e845595926122fa5f77253cbe3b48f71ac930cdf2f894e8f3385d2b3c7274e1a2373165ac6c10263d4424f241ce1f5115d41f4e03fedaa4d9f6797bbd
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uz.tar.gz 476321 SHA256 c0f8a08d64846a26785d39e7f5b38a9a2da7168d15fa9fbf3690ddeb114c3838 SHA512 1469b2ae1e5166a26f63fecb317d202efdc0fc581aa6251c3d7c0cd2b34ebd632ead466d4473e79447164f1e6dba89a2d60f0d7aae8cabbf45f6875961e9c101 WHIRLPOOL 8b7172b4b88403518e8f44983c6a53b4af256137b78307926248b9aa724e0d07a0f50b681f417e0414dabc4f66a08099ff367c27cdb4ce832bee490bd5898531
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ve.tar.gz 486203 SHA256 a5ff7b277e3c394e36d6afa251eed99d50466b8eecd30f0272efaae61c17591b SHA512 a64204c9e84a049956a4a9106b2086cbff73b892a38e05a4a841569af3cfb19fe210760b0e7386596ecdd92a17b7a79fd433ba8416d39ab458c4f4081d502636 WHIRLPOOL 7cbd4802139f6c389f32d485d6e220ee2b046800343c901eb5336f40ff36688befacebb2508999f66d9364836f2c455754e2d615a6c394dc2e4a63661bb44be2
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_vi.tar.gz 514015 SHA256 614e5eb3100b8b5509ae82bc7a36d3d9757d3ff400c402298b16fe0c05da416b SHA512 e9b19df4fd14786f0dfd17c9f14bad504a6002fe61d0251602826eb3785a92ad707b936cee043b8b6cc8a6d28577a4aa97d5bf61765aea7eb84862bbebad38db WHIRLPOOL 98c817e042f1e85134de819d7d563f01d494a33bf5219f27b09c463c7cff72dca94dee0356c2aafbd1b1bcd963638d3fa5b24073a1bc5ae99b09ea50af4381e0
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_xh.tar.gz 490205 SHA256 bdb92304276da308be89b39b68ff46c964e575b38f4f6e29c5998285135e525c SHA512 7f9109119629ed6ed515d2ed9478ecdf3da36054412aaac52fbda3b7df26b063dfe253a6d0c5aa65646183cc94ed9eb8a20c6025707c00ebed21417526b4dec6 WHIRLPOOL b6dca9271a7d63dc05b8657c52ba7c1521816f67cddbc795254fb53cf4bcfac8c718b9b1115679a143181bf67129f6dba4e43a3b4b799ac15c21cbb5acf8f1d4
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 563364 SHA256 0f6adebbd43eefb42249be8a0f49a6bc6cd0f6bc59d39cb7eff443f57bcd37a4 SHA512 dbb6a06a1dafafa265786ec11ed41f3f6f3f4f3d78d49a6b1f8a625c33d0d6ae3326c36268a500a6e5aa78decfa40c43d59b955a9d83c8292c2f0702c56843a5 WHIRLPOOL c5b2c047c5984b92669467680cb4ebd561b8cc453316d298e5a4f2d599cfacdc4f354bd8db7e65890e541c1ad69402b4d7b62b2380202decee98834a1ab1a699
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 560999 SHA256 ae21baf34578a9653eb1c2d441cf0ebd1ae1b683656adc32c5608285b2a6130d SHA512 7008bedab387a006a114792b2a58e80a66322970d5b88738da4787c82f0ccea93db3ffe0665064acb13a532fb13e43316a038270b3845075b043eb530e4cb952 WHIRLPOOL e068440861ec1cd4b4ad665ac99fc7f09a2253036735a0050e59f06f4671f4824ed60fcb03ad309060489d7089b6b5f3fa4bc65f07c8236405015c4340c2f173
+DIST LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zu.tar.gz 492834 SHA256 b4edf7f8e7413091d08cf07c9504b03aa058a6d454c7da2ba0b8db7b2ac00797 SHA512 f1228ca1fbd1efa11de1869f386207b86504fc606dfae98139cdef19ec60d7539c1e06079aa66a7e11f28869e7a2578d979aa7f8cb8a54de59342899a7994ee4 WHIRLPOOL 7b63b94718f53640bf5c77862d56a0cf9961d973f1a7f70bd87d6fbb276ed3b4183e2ff145e0eaec47649e7da41e704fe6ce8b60bbaa80630ec5fca7ac00f31d
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.2.4.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.2.4.1.ebuild
new file mode 100644
index 000000000000..181b66b1e74c
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.2.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+	# Condition required for people that do not install anything eg no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d9ff85e55e90..3b4e57ee94c1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,5 +7,7 @@ DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d46
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
 DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
+DIST libreoffice-5.2.4.2.tar.xz 182536912 SHA256 8b73d1afa6a1ff6bc153ab1f31afc86c42cc8d0e5831bf82e66a8df0fcf6eb10 SHA512 17b892f7c6b43189a08e5b2f8844cec486293daaa9b22afe4b9a0b8e3747cc9646018eb976c80af1a8eea34c29077fb945ff724d8d0f6ee20cebbce94e5ded5b WHIRLPOOL 5fa230bc98d2a3696bad0aba5598db763f98d1a632d871e47ceb308ee566fdda99c531516671a126fd376ca08bc74e801afc316d80e1f1a1bb2c73ae6589866c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
+DIST libreoffice-help-5.2.4.2.tar.xz 1918520 SHA256 fef3a7699d20e198ac66267f50ffce5bcbef48617434af477de8887340ebe182 SHA512 f0ad65a01c589e3a2377130221d42497848a8407b71fe6450b1dd4bd7978c66ee42281f0da5a881c7317750804af5108ec50cf79707b2910a0b879039e487d0b WHIRLPOOL 7532f6cae8432c14c8e2be18bb3bf9193a63bd20ca7992187da8f4e68004de4b32b9f8eb8ee6f3b4c6436eaf8d89fae1717335b2b0eb43856d929d1dbccce064
diff --git a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
new file mode 100644
index 000000000000..1202118d53ce
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-text/hunspell
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.55:=
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	=dev-libs/liborcus-0.11*
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/glew-1.10:=
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	x11-libs/cairo[X,-xlib-xcb]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/dconf )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	!<sys-devel/make-3.82
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.2.0:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	eds? ( gnome )
+	gnome? ( gtk )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# from master branch
+	"${FILESDIR}/${PN}-5.2-icu58.patch"
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+)
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_pretend
+
+		if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+				[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+			eerror "Compilation with gcc older than 4.7 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 local pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local ext_opts
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+	fi
+
+	if use kde; then
+		# bug 544108, bug 599076
+		export QMAKEQT4="$(qt4_get_bindir)/qmake"
+		export MOCQT4="$(qt4_get_bindir)/moc"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-dicts \
+		--with-system-headers \
+		--with-system-jars \
+		--with-system-libs \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-release-build \
+		--disable-ccache \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gstreamer-0-10 \
+		--disable-hardlink-deliver \
+		--disable-online-update \
+		--disable-report-builder \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-sun-templates \
+		--without-system-sane \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome dconf) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable pdfimport) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable quickstarter systray) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk3; then
+		dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files to support old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
new file mode 100644
index 000000000000..732c9634f10e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == core ]]; then
+				SRC_URI+=" ${i}/${P}.tar.xz"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-text/hunspell
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	>=dev-libs/liborcus-0.12.1
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/glew-1.10:=
+	media-libs/harfbuzz:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	x11-libs/cairo[X,-xlib-xcb]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	collada? ( media-libs/opencollada )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-2.5 )
+	gltf? ( media-libs/libgltf )
+	gnome? ( gnome-base/dconf )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		x11-libs/gtk+:3
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	!<sys-devel/make-3.82
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.2.2:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	collada? ( gltf )
+	eds? ( gnome )
+	gnome? ( gtk )
+	telepathy? ( gtk )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+)
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_pretend
+
+		if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+				[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+			eerror "Compilation with gcc older than 4.7 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# Ensure pg version but we have to be sure the pg is installed (first
+	# install on clean system)
+	if use postgres && has_version dev-db/postgresql; then
+		 local pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	local mod
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	use branding && unpack "${BRANDING}"
+
+	if [[ ${PV} != *9999* ]]; then
+		unpack "${P}.tar.xz"
+		for mod in ${MODULES}; do
+			[[ ${mod} == core ]] && continue
+			unpack "${PN}-${mod}-${PV}.tar.xz"
+		done
+	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
+		for mod in ${MODULES}; do
+			branch="master"
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+		done
+	fi
+}
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+	fi
+}
+
+src_configure() {
+	local java_opts
+	local ext_opts
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+		else
+			ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		java_opts="
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		"
+
+		use libreoffice_extensions_scripting-beanshell && \
+			java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+		use libreoffice_extensions_scripting-javascript && \
+			java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+	fi
+
+	if use kde; then
+		# bug 544108, bug 599076
+		export QMAKEQT4="$(qt4_get_bindir)/qmake"
+		export MOCQT4="$(qt4_get_bindir)/moc"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-dicts \
+		--with-system-headers \
+		--with-system-jars \
+		--with-system-libs \
+		--enable-cairo-canvas \
+		--enable-graphite \
+		--enable-largefile \
+		--enable-mergelibs \
+		--enable-neon \
+		--enable-python=system \
+		--enable-randr \
+		--enable-release-build \
+		--disable-breakpad \
+		--disable-ccache \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gstreamer-0-10 \
+		--disable-online-update \
+		--disable-report-builder \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-parallelism=$(makeopts_jobs) \
+		--with-system-ucpp \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-help \
+		--with-helppack-integration \
+		--without-system-sane \
+		$(use_enable bluetooth sdremote-bluetooth) \
+		$(use_enable coinmp) \
+		$(use_enable collada) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable firebird firebird-sdbc) \
+		$(use_enable gltf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome dconf) \
+		$(use_enable gstreamer gstreamer-1-0) \
+		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mariadb-connector) \
+		$(use_enable odk) \
+		$(use_enable pdfimport) \
+		$(use_enable postgres postgresql-sdbc) \
+		$(use_enable quickstarter systray) \
+		$(use_enable telepathy) \
+		$(use_enable vlc) \
+		$(use_with coinmp system-coinmp) \
+		$(use_with collada system-opencollada) \
+		$(use_with gltf system-libgltf) \
+		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with odk doxygen) \
+		${java_opts} \
+		${ext_opts}
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=icon-themes/galaxy/res/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk3; then
+		dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files to support old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6dcbd215560e..c9bad32b055e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -121,10 +121,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-gfx/graphite2
 	media-libs/fontconfig
 	media-libs/freetype:2
-	>=media-libs/glew-1.10:=
-	media-libs/harfbuzz:=[graphite,icu]
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
 	media-libs/lcms:2
 	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1
 	>=media-libs/libfreehand-0.1.0
 	media-libs/libpagemaker
 	>=media-libs/libpng-1.4:0=
@@ -134,12 +134,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
-	virtual/jpeg:0
 	x11-libs/cairo[X,-xlib-xcb]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	virtual/glu
+	virtual/jpeg:0
 	virtual/opengl
 	bluetooth? ( net-wireless/bluez )
 	coinmp? ( sci-libs/coinor-mp )
@@ -151,7 +151,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		gnome-extra/evolution-data-server
 	)
 	firebird? ( >=dev-db/firebird-2.5 )
-	gltf? ( media-libs/libgltf )
+	gltf? ( >=media-libs/libgltf-0.1.0 )
 	gnome? ( gnome-base/dconf )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -414,7 +414,6 @@ src_configure() {
 	# system headers/libs/...: enforce using system packages
 	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
 	# --enable-cairo: ensure that cairo is always required
-	# --enable-graphite: disabling causes build breakages
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
 	# --disable-fetch-external: prevent dowloading during compile phase
@@ -424,13 +423,12 @@ src_configure() {
 	# --without-system-sane: just sane.h header that is used for scan in writer,
 	#   not linked or anything else, worthless to depend on
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--with-system-dicts \
+		--with-system-epoxy \
 		--with-system-headers \
 		--with-system-jars \
 		--with-system-libs \
 		--enable-cairo-canvas \
-		--enable-graphite \
 		--enable-largefile \
 		--enable-mergelibs \
 		--enable-neon \
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
index 023f5ddc7659..7bb57e894c29 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-shells/fish/fish-2.4.0.ebuild b/app-shells/fish/fish-2.4.0.ebuild
index 154c96518a59..4154a47738d9 100644
--- a/app-shells/fish/fish-2.4.0.ebuild
+++ b/app-shells/fish/fish-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-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="X"
 
 DEPEND="sys-libs/ncurses:0=
diff --git a/app-text/dos2unix/dos2unix-7.3.4.ebuild b/app-text/dos2unix/dos2unix-7.3.4.ebuild
index 456f413c5f3f..bee9714d3464 100644
--- a/app-text/dos2unix/dos2unix-7.3.4.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
index 8eb57d3dc0e2..cc1a2e6558fc 100644
--- a/app-text/libabw/libabw-0.1.1.ebuild
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Library parsing abiword documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
@@ -41,13 +41,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-werror \
-		$(use_enable static-libs static) \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index ac516acf21ce..53db1d633613 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 MY_PN="libe-book"
 MY_P="${MY_PN}-${PV}"
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Library parsing various ebook formats"
 HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="doc test"
+IUSE="doc test tools"
 
 RDEPEND="
 	dev-libs/icu:=
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	dev-libs/boost:=
+	dev-libs/boost
 	dev-util/gperf
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -48,10 +48,10 @@ src_configure() {
 		--disable-werror \
 		$(use_with doc docs) \
 		$(use_enable test tests) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_with tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
index e8bd2e4c318f..70dbb606d4c5 100644
--- a/app-text/libebook/metadata.xml
+++ b/app-text/libebook/metadata.xml
@@ -5,6 +5,9 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">libebook</remote-id>
 	</upstream>
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
index 8637cf4bc6cc..99d1b92fa3ae 100644
--- a/app-text/libetonyek/libetonyek-0.1.6.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit autotools eutils
+inherit autotools
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
@@ -56,14 +56,13 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_enable test tests) \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index aae98f248363..837270a6dab9 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
@@ -51,15 +50,14 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_enable test tests) \
 		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
 		--with-mdds=1.2
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild b/app-text/libmspub/libmspub-0.1.2.ebuild
index b2b9408f38e5..9fbaf9603c75 100644
--- a/app-text/libmspub/libmspub-0.1.2.ebuild
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Microsoft Publisher documents"
@@ -41,13 +40,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index be2fb21009a9..ee56c5a5155b 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Microsoft Publisher documents"
@@ -41,13 +40,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmwaw/libmwaw-0.3.8.ebuild b/app-text/libmwaw/libmwaw-0.3.8.ebuild
index 234cf6f9f63e..5a1b195dbd9e 100644
--- a/app-text/libmwaw/libmwaw-0.3.8.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.8.ebuild
@@ -5,11 +5,10 @@
 EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
@@ -26,7 +25,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46:=
+	dev-libs/boost
 	sys-devel/libtool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -40,15 +39,14 @@ src_prepare() {
 src_configure() {
 	# zip is hard enabled as the zlib is dep on the rdeps anyway
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-sharedptr=boost \
 		--enable-zip \
 		--disable-werror \
-		$(use_enable static-libs static) \
-		$(use_with doc docs)
+		--with-sharedptr=boost \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmwaw/libmwaw-0.3.9.ebuild b/app-text/libmwaw/libmwaw-0.3.9.ebuild
index a8a3aae2772a..3d50f04353af 100644
--- a/app-text/libmwaw/libmwaw-0.3.9.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.9.ebuild
@@ -5,11 +5,10 @@
 EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
@@ -18,7 +17,7 @@ SLOT="0"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="doc static-libs"
+IUSE="doc static-libs tools"
 
 RDEPEND="
 	dev-libs/librevenge
@@ -26,7 +25,6 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46:=
 	sys-devel/libtool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -40,15 +38,15 @@ src_prepare() {
 src_configure() {
 	# zip is hard enabled as the zlib is dep on the rdeps anyway
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-sharedptr=boost \
 		--enable-zip \
 		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(use_with doc docs) \
 		$(use_enable static-libs static) \
-		$(use_with doc docs)
+		$(use_enable tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index a8a3aae2772a..a1f58dc56e5a 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
@@ -18,7 +17,7 @@ SLOT="0"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="doc static-libs"
+IUSE="doc static-libs tools"
 
 RDEPEND="
 	dev-libs/librevenge
@@ -26,7 +25,6 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46:=
 	sys-devel/libtool
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -40,15 +38,15 @@ src_prepare() {
 src_configure() {
 	# zip is hard enabled as the zlib is dep on the rdeps anyway
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-sharedptr=boost \
 		--enable-zip \
 		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(use_with doc docs) \
 		$(use_enable static-libs static) \
-		$(use_with doc docs)
+		$(use_enable tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
index c7b86421be26..09f5b872fd22 100644
--- a/app-text/libmwaw/metadata.xml
+++ b/app-text/libmwaw/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">libmwaw</remote-id>
 	</upstream>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
index 80975a99492f..29f334adfb46 100644
--- a/app-text/libodfgen/libodfgen-0.1.6.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.6.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
@@ -24,13 +23,12 @@ RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
@@ -38,12 +36,11 @@ src_configure() {
 	econf \
 		--disable-static \
 		--disable-werror \
-		--with-sharedptr=boost \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-sharedptr=c++11 \
 		$(use_with doc docs)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 80975a99492f..29f334adfb46 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
@@ -24,13 +23,12 @@ RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
@@ -38,12 +36,11 @@ src_configure() {
 	econf \
 		--disable-static \
 		--disable-werror \
-		--with-sharedptr=boost \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-sharedptr=c++11 \
 		$(use_with doc docs)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libwpd/libwpd-0.10.1.ebuild b/app-text/libwpd/libwpd-0.10.1.ebuild
index 43b61098ab25..d1631de9271c 100644
--- a/app-text/libwpd/libwpd-0.10.1.ebuild
+++ b/app-text/libwpd/libwpd-0.10.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit alternatives eutils
+inherit alternatives
 
 DESCRIPTION="WordPerfect Document import/export library"
 HOMEPAGE="http://libwpd.sf.net"
@@ -15,13 +15,11 @@ SLOT="0.10"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips x86 ~x86-fbsd"
 IUSE="doc +tools"
 
-COMMON_DEPEND="dev-libs/librevenge"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-RDEPEND="${COMMON_DEPEND}
-	!<app-text/libwpd-0.8.14-r1"
 
 src_configure() {
 	econf \
@@ -29,13 +27,12 @@ src_configure() {
 		--disable-werror \
 		$(use_with doc docs) \
 		$(use_enable tools) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT}
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 6965195d15db..19419ec1fa6e 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Office project</name>
 	</maintainer>
 	<use>
-		<flag name="tools">Build miscellaneous tools</flag>
+		<flag name="tools">Build file conversion tools</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">libwpd</remote-id>
diff --git a/app-text/libwpg/libwpg-0.3.1.ebuild b/app-text/libwpg/libwpg-0.3.1.ebuild
index a336154985a3..284db7e20b63 100644
--- a/app-text/libwpg/libwpg-0.3.1.ebuild
+++ b/app-text/libwpg/libwpg-0.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit alternatives eutils
+inherit alternatives
 
 DESCRIPTION="C++ library to read and parse graphics in WPG"
 HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
@@ -27,14 +27,13 @@ src_configure() {
 	econf \
 		--disable-werror \
 		--program-suffix=-${SLOT} \
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
 		$(use_with doc docs) \
 		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-text/libwps/libwps-0.4.4-r1.ebuild b/app-text/libwps/libwps-0.4.4-r1.ebuild
index 6f1a54b5a1d4..b12d855137c3 100644
--- a/app-text/libwps/libwps-0.4.4-r1.ebuild
+++ b/app-text/libwps/libwps-0.4.4-r1.ebuild
@@ -4,16 +4,14 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="http://libwps.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm x86"
-IUSE="doc debug static-libs"
+IUSE="doc debug static-libs tools"
 
 RDEPEND="
 	app-text/libwpd:0.10
@@ -30,10 +28,11 @@ src_configure() {
 		--with-sharedptr=c++11 \
 		$(use_enable debug) \
 		$(use_with doc docs) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(use_enable tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
index 75ecdaf87066..e942043e4489 100644
--- a/app-text/libwps/metadata.xml
+++ b/app-text/libwps/metadata.xml
@@ -9,6 +9,9 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">libwps</remote-id>
 	</upstream>
diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820.ebuild
index afb9637796f5..5f470d515660 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20160820.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
-inherit eutils alternatives autotools ${SCM_ECLASS}
+inherit alternatives autotools ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="C++ client library for the CMIS interface"
@@ -56,7 +56,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_with man) \
@@ -67,7 +66,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index f6c40f8a2d59..0cc6c176ac3b 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
-inherit eutils alternatives autotools ${SCM_ECLASS}
+inherit alternatives autotools ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="C++ client library for the CMIS interface"
@@ -56,7 +56,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_with man) \
@@ -67,7 +66,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 446203154e2a..7e2fb4f8d9d9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
 DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584
 DIST mariadb-10.0.28.tar.gz 63297461 SHA256 0a5033d56f1c5403df7fabd519ccbdc4da308b30a1ecd52e06a19be182a9bab2 SHA512 af4a0e830902d8916b4727e8d3d70ff5c5b7871b46fedb5d890881b5d22f196a423da0d4b1e9e0e6a25a40cfacd7fb1781d4a85dc1f9b31c89bbde8b50ffabc3 WHIRLPOOL 65c889d663f5ccacd9bebf87d5631d4ccb86df2245008db802697efb54f4db99fa461019b6aa58d3e95a76903de184e17590b2c606a1661a9686c6b448ade6aa
 DIST mariadb-10.1.19.tar.gz 61222929 SHA256 5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 SHA512 28fb7178b71ec287f91f06ec0939ec877097ed21ff96b013c139a9584ccffbc9fc8694707e0d3c44cd61da33b54311116f858d31931ba289cdb22776c872f285 WHIRLPOOL 8e24d87054ccabde4873a4faae5c9ce82aa5f84c1afd39c9152e9bff6aadc7bc73b5532e7944173fc9ea2ce1bd13d68122deb941718819c617d8b1daee974a3b
+DIST mariadb-10.1.20.tar.gz 61312731 SHA256 c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9 SHA512 926067a30e54354f6482e28152694e747f4deb8b4ba6d054e089955b45f98f628ea8cca4cfbc12f6220fa6b8b6f2ba9fef7c23c09cb82b23f370acdd32a9e892 WHIRLPOOL ff7d3e180ab6e1a546d0e7c0517ec9138ce0dabf1768fe1270a018446c0a5727017ef94e2495295237d54ac21690c96ca7fce0d9f3f416584ce75b38470314b4
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.53.tar.gz 45739935 SHA256 4517296f5686af83c3f67bd9183ca1038c73a9c6c5e680389d167f72c644124e SHA512 43d98de3d392a7598265752433a1443432dd5029ebef22a7b20816194c65a14c480df064cb36875af414b47d994d31f6431c49d6b5988021f314d9518c8af90d WHIRLPOOL f9fa83d709689f1e2aba116d4c16bc2f1226d4cf1fc74b5b7f6a73d0647aa796bd3e92ff8bcd3e62f41d480e8c56ee1f10e765dd5c320a6385e6a3ecfb0f03da
 DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f
diff --git a/dev-db/mariadb/mariadb-10.1.19.ebuild b/dev-db/mariadb/mariadb-10.1.20.ebuild
similarity index 97%
rename from dev-db/mariadb/mariadb-10.1.19.ebuild
rename to dev-db/mariadb/mariadb-10.1.20.ebuild
index ba8719acbcf3..fd663ad6596e 100644
--- a/dev-db/mariadb/mariadb-10.1.19.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.20.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
 RESTRICT="!bindist? ( bindist )"
 
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -129,9 +129,9 @@ src_configure(){
 			-DCONNECT_WITH_ODBC=$(usex odbc)
 			-DCONNECT_WITH_JDBC=$(usex jdbc)
 			-DWITH_WSREP=$(usex galera)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
 			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
 			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
 		)
diff --git a/dev-db/postgresql/postgresql-9.1.24.ebuild b/dev-db/postgresql/postgresql-9.1.24.ebuild
index a27ac30674e5..575f35714fbc 100644
--- a/dev-db/postgresql/postgresql-9.1.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.24.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.19.ebuild b/dev-db/postgresql/postgresql-9.2.19.ebuild
index e3b6b09e463d..b80453ed5619 100644
--- a/dev-db/postgresql/postgresql-9.2.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.19.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.15.ebuild b/dev-db/postgresql/postgresql-9.3.15.ebuild
index b47565eb4a8d..ffda05795ee7 100644
--- a/dev-db/postgresql/postgresql-9.3.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.15.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.10.ebuild b/dev-db/postgresql/postgresql-9.4.10.ebuild
index 9fec8f0f2dda..e26c98376455 100644
--- a/dev-db/postgresql/postgresql-9.4.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.10.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.5.ebuild b/dev-db/postgresql/postgresql-9.5.5.ebuild
index 026b0d57c427..51c9f7af54a6 100644
--- a/dev-db/postgresql/postgresql-9.5.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-lang/go/go-1.7.4.ebuild b/dev-lang/go/go-1.7.4.ebuild
index 58d44c510fa3..0ac8e4f27665 100644
--- a/dev-lang/go/go-1.7.4.ebuild
+++ b/dev-lang/go/go-1.7.4.ebuild
@@ -45,7 +45,7 @@ else
 	case ${PV} in
 		*9999*|*_rc*) ;;
 		*)
-			KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+			KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 			;;
 	esac
 fi
diff --git a/dev-lang/perl/perl-5.22.3_rc4.ebuild b/dev-lang/perl/perl-5.22.3_rc4.ebuild
index 77f3fffffc03..77ec5df681f4 100644
--- a/dev-lang/perl/perl-5.22.3_rc4.ebuild
+++ b/dev-lang/perl/perl-5.22.3_rc4.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-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"
+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-libs/libebml/libebml-1.3.4.ebuild b/dev-libs/libebml/libebml-1.3.4.ebuild
index af1612b553b7..b5adb37b853f 100644
--- a/dev-libs/libebml/libebml-1.3.4.ebuild
+++ b/dev-libs/libebml/libebml-1.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/liborcus/liborcus-0.11.2.ebuild b/dev-libs/liborcus/liborcus-0.11.2.ebuild
index 7fc4520464d5..0e56eac72bf7 100644
--- a/dev-libs/liborcus/liborcus-0.11.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.11.2.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 PYTHON_COMPAT=( python{3_4,3_5} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils python-single-r1 ${GITECLASS}
+inherit python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
-	>=dev-libs/boost-1.51.0:=
+	dev-libs/boost:=
 	sys-libs/zlib:=
 	python? ( ${PYTHON_DEPS} )
 	spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= )
@@ -39,7 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
@@ -54,6 +54,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liborcus/liborcus-0.12.1.ebuild b/dev-libs/liborcus/liborcus-0.12.1.ebuild
index 5e361d4d82e5..03418c251d46 100644
--- a/dev-libs/liborcus/liborcus-0.12.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.12.1.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 PYTHON_COMPAT=( python3_{4,5} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils python-single-r1 ${GITECLASS}
+inherit python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -55,5 +55,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 4c941bf77357..42c5f71b4a53 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 PYTHON_COMPAT=( python3_{4,5} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils python-single-r1 ${GITECLASS}
+inherit python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -54,5 +54,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index 2183abc3f7bf..beb8258023d2 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/metadata.xml
@@ -10,7 +10,7 @@
 	</slots>
 	<use>
 		<flag name="spreadsheet-model">Enable the spreadsheet model implementation</flag>
-		<flag name="tools">Build miscellaneous tools</flag>
+		<flag name="tools">Build various low-level parsers</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">orcus/orcus</remote-id>
diff --git a/dev-libs/librevenge/librevenge-0.0.4.ebuild b/dev-libs/librevenge/librevenge-0.0.4.ebuild
index 5ebbd773b150..eb932b4908cf 100644
--- a/dev-libs/librevenge/librevenge-0.0.4.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A helper library for REVerse ENGineered formats filters"
 HOMEPAGE="http://sf.net/p/libwpd/librevenge"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	default
 	[[ ${PV} = 9999 ]] && eautoreconf
 }
 
@@ -40,10 +41,9 @@ multilib_src_configure() {
 		--disable-static \
 		--disable-werror \
 		$(use_with doc docs) \
-		$(use_enable test tests) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable test tests)
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index e98fab1c9b99..03f0a4df373c 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit eutils multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="A helper library for REVerse ENGineered formats filters"
 HOMEPAGE="http://sf.net/p/libwpd/librevenge"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} = 9999 ]] && eautoreconf
 }
 
@@ -41,10 +41,9 @@ multilib_src_configure() {
 		--disable-static \
 		--disable-werror \
 		$(use_with doc docs) \
-		$(use_enable test tests) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable test tests)
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
index 685d91440cc7..8abdd98b9dcf 100644
--- a/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-lisp/clx/clx-0.7.4.ebuild b/dev-lisp/clx/clx-0.7.4.ebuild
index e30c37d325e6..643c6ae449c4 100644
--- a/dev-lisp/clx/clx-0.7.4.ebuild
+++ b/dev-lisp/clx/clx-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for
 HOMEPAGE="http://www.cliki.net/CLX"
 SRC_URI="http://common-lisp.net/~abridgewater/dist/${PN}/${P}.tgz"
 
-LICENSE="CLX"
+LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
diff --git a/dev-lisp/clx/clx-9999.ebuild b/dev-lisp/clx/clx-9999.ebuild
index bf616dd9c08f..5eb764c50e70 100644
--- a/dev-lisp/clx/clx-9999.ebuild
+++ b/dev-lisp/clx/clx-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit common-lisp-3 git-2
+inherit common-lisp-3 git-r3
 
-DESCRIPTION="A fork of crhodes' fork of danb's fork of the CLX library, an X11 client for Common Lisp"
+DESCRIPTION="A fork of crhodes' fork of danb's fork of CLX, an X11 client for Common Lisp"
 HOMEPAGE="https://github.com/sharplispers/clx http://www.cliki.net/CLX"
 EGIT_REPO_URI="git://github.com/sharplispers/clx.git"
 
-LICENSE="CLX"
+LICENSE="MIT"
 SLOT="0"
 IUSE=""
-
-RDEPEND="!dev-lisp/cl-${PN}"
diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild
index b87f5c8dcebf..190ac7c50796 100644
--- a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild
+++ b/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
+
 MY_PV=${PV/./-}
 MY_P=HyperSpec-${MY_PV}
 
@@ -31,6 +33,6 @@ EOF
 
 src_install() {
 	dodir /usr/share/doc/${P}
-	cp -r HyperSpec* ${D}/usr/share/doc/${P}
+	cp -r HyperSpec* "${D}/usr/share/doc/${P}"
 	dosym /usr/share/doc/${P} /usr/share/doc/hyperspec
 }
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index afe766efa598..c0bf30982fa6 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1,3 +1,4 @@
 DIST iTeML-2.0.1.tar.gz 38387 SHA256 ae6ff9d0fcc20b8e96a44517fb3641d5193c63169aae33f0c1912db8e14bef1f SHA512 1f72ed8320a7589206daa16232199f33012cac397cf21a60fd8afccb7e8aad6f9125e8b4ac494866f699d0a47569bbd0486584a299786e0ef7a3a2c234f0ac2b WHIRLPOOL c23392412b4fcead6dd5958739802d895cdee3a86f333038ad03639d28a5439858de411bea19ce25df1bce72482b07d3047e8862a89fb49e24cfe0956d45d768
 DIST iTeML-2.2.tar.gz 50025 SHA256 c31e5449624fc6729a362cc73efe475b2965d2e602b69b3a06fab2b38ea18b36 SHA512 78fb71a00d785f7faf0faa08c988bdfffe755dc6554437c86c80a4e56d6fb001606c78159e23acf0230286167585d136754dda68f8d7486aef64b228cc69034d WHIRLPOOL 672ce047cd901cd38671cf6f1020bf5d4c6e7cd13b3af4138ebad2015ca7db54a558cbbbdbda66d2aacfb3a1c7f709de95808b8d193b9551660f60349e3f346b
 DIST iTeML-2.3.tar.gz 51077 SHA256 749bec7a7f91a0ee4e86811f70e423319181a7d4f2bfcfcb718448020d2dfdd8 SHA512 ac83c18baf9d0cb9de027881356cfffd4cb7e698598cc85badd31ebfbfe2d21ff94d35bf9ac997b08c2a4eb88eded759708f2759a11c088a63fe3c79e3db3ed4 WHIRLPOOL 71ec844e9851ecbc27afbf8d6d0f31ec73064eee7752840c458492abad6e432c2e072fe3fc695c910fc5bbadc4fa9fac8cffd5cbdfed2df82d87c837a2899d73
+DIST iTeML-2.4.tar.gz 51354 SHA256 46488f19c4df8b6ec6ca638084e4f18cb647e46fa536863e0fe29fac8f12b76c SHA512 38461ec3ba68b5823d43fa6f955e17bb456dacf7aec94a3195d73db15c42cc080acfd6d2b81bc2d730f84656da3fc2755a0916512e65520326f5bcd4cdcadf64 WHIRLPOOL 0282ab98d7b011568ddfe20f0eeeda991cf5e583b10bd756aeb75031ee6c55e24c37a57796f11e03fbfd83b3bc681ebd61a2ac17decb495aa4e4805f0cf46529
diff --git a/dev-ml/iTeML/iTeML-2.4.ebuild b/dev-ml/iTeML/iTeML-2.4.ebuild
new file mode 100644
index 000000000000..a13efbe16629
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+	dev-lang/ocaml:=[ocamlopt]
+	!dev-ml/qckeck
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	findlib_src_preinst
+	dodir /usr/bin
+	emake BIN="${ED}/usr/bin/" install
+	dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index e64555ba8324..da3a3308a733 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,3 +1,4 @@
 DIST ocaml-ctypes-0.10.2.tar.gz 190090 SHA256 9888667de03c330d3845e8ded0df53f9e1d234be2c3696517a1e98e176116cea SHA512 73374e2063882347fa8458564f8bf49365aa493cb8aa3abcea01c92fc399c1ef0a977df9d87542bd781c6fc6d042dda1c0e13283b550538d173f08df9ce2ce0d WHIRLPOOL ff19c015fb38a1e20fb772b6628fcacce744ca57a42890052b061f6f697fd0bd5d24225de852f734812a623fa63877827993f4b359721b841d0f92b854b2edb3
 DIST ocaml-ctypes-0.11.1.tar.gz 202879 SHA256 6be8a5ed4fc2da6051b42aa59648934ea2f9080d783c92f610e91454059b97e2 SHA512 b25beab78ea099d30ef4fdbabfb23eef2eb1dbd9421c3294b632ffda2327c54909913a97837eb25fadb2a0ae6aaf7f4725811845e5a98baa946690b43628b8ce WHIRLPOOL 1c8f1c9045277ea21e5192b08566a4ce363e26ee2b4ab6f5cde77d85965c0080c4ebc7870f827ac91d79f7bcda484c895ce5e4149c451c6b6257b64665bca5e0
+DIST ocaml-ctypes-0.11.2.tar.gz 203564 SHA256 708e2c5501ba00b3ed6726a7da1c2b58f607859e8e1cc0381eefd222510488d6 SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a WHIRLPOOL cbf74628695e01dfe2e379a7c645313e36eaae98f733cda231a290960e52241c96bcc2fb8491daa28b964cf06c0d43a41282767a2d9fa1a4a6f395736eb08864
 DIST ocaml-ctypes-0.4.1.tar.gz 162601 SHA256 74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5 SHA512 8155ffe16a58d5714ceb602afa5531c93526defca39a16047328ac06d2c7c7f52b768b18170391f467e1f6919c69275734faf85d27315e11b8bbefcb1bc8afa9 WHIRLPOOL d8d0ef24e0b6c40f50fddf38fed7238cf95573909d2809cc2ab5c1b9b3dab333210e1ce99cf805804576a79d08d819e2ecdee7b4a6a9e13efb13e7b9f88ad802
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
new file mode 100644
index 000000000000..d563719db9e5
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 10d0f2455f7c..5737b0ceea2a 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,4 +1,2 @@
-DIST sqlite3-ocaml-4.0.3.tar.gz 67376 SHA256 390383088b07fde6f775d060e59551ea796334b23b480d9937ad6429cd615d30 SHA512 5304874ac51aba140a4f2d5bbd147092d25a7fdfb006ff89800d54d7351e717b4db28732f0c7acba80d24bc78e198249cd01c1801034040bded8ebd941bfd482 WHIRLPOOL c2ecacd570b06a3ac375cba88b54ccf5de9ae130dcffbc71d25a91f16c5ccbecdb4303e7da8e7addb4027d8b0457798e1858ec2a82866d2b6089a9d6c6243ba0
-DIST sqlite3-ocaml-4.0.4.tar.gz 67641 SHA256 f8cfe8c597835c7c5e5f3fbf9e12b9ee882009c0fee956e102bb4a7190c0e3cf SHA512 679eb9b1b2926e8e6e21f0ff3204435faf6855218d087a3881bd6ffd403cc85bd6073fd737200a5c3b0484a80ea139fcd1fc5d6d66bdba99f19df555373d447c WHIRLPOOL c82e99989f7b60d6bd2e721c9146d57d63570a003221e101f517ab377275d5d96abbc36b43fab458724104f75e8175687d0af0992d0e8a22e34fc1ba5c4720b1
-DIST sqlite3-ocaml-4.0.5.tar.gz 67839 SHA256 bf0bdc597533d62b8de2798e9aa46c37570875cb4af4f9f42fba21dd59f3f0cb SHA512 cdb01cddc702e30fdeaf5b7a45223d28abf33f3568850d5dad97926cf1358990edb363c38e199c1f30048e2d79211e6ad84046f8ed5d5ad4f0f6527b19b8e70d WHIRLPOOL ec319097214426e1d94b32c9d788490839bd5cb542a8c0b3354b4dc98028225ee54bdbe4a32ec481d842772730c2625f3bf5c9da4e705dcac99bab1bcbda661d
 DIST sqlite3-ocaml-4.0.6.tar.gz 70620 SHA256 921be9aab70743d8e56e51fdcc23c0974e54991e416e23d5dd025ca8d1adb269 SHA512 8659207d4ea08d062c465f6ac03f754b3c3eb7a9d17b95bb08a9a578eb45b4683400435ca063ad9b0c52267da060823dcaa4c566e5bcedf9229f24726d32a2b3 WHIRLPOOL c4cb389931682ceca6460281887707cd89e2e6b068499dd7e9b1061123b35279b3ca044bc328e9f4538cfc1d38c6f46f46116f0f62ba01634b0e6eb766267c8f
+DIST sqlite3-ocaml-4.1.0.tar.gz 76762 SHA256 1ab50edeee261da6835bc3b80e3d30172e37f2f230d186ae0099c1539574b79b SHA512 d444534d02039b1b505c1dbe9dcee4e29c3b4b6a4ed1f480552598a59a0748ebba144a54656fdc6d652993a22adaa69434ebf97dca4ab17a379160587d497fec WHIRLPOOL 090ac0f2cc2b8f828e91b076751cc1e6f79206d49d4ca5708dc3cdbac47a45792dfbd637eadda00cce75c3ec33d219cd5c8cf7d13308317dd32a3a591d4847ac
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild
deleted file mode 100644
index d10376724c86..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${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/ocaml-sqlite3/ocaml-sqlite3-4.0.5.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.5.ebuild
deleted file mode 100644
index c4ac79bc1c30..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${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/ocaml-sqlite3/ocaml-sqlite3-4.0.4.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.0.ebuild
similarity index 100%
rename from dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.4.ebuild
rename to dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.0.ebuild
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
index e5da25b437ac..a3fab1bd11d7 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # embedded=on disables ssl support
 # https://metacpan.org/source/MICHIELB/DBD-mysql-4.036/dbdimp.c#L1886
diff --git a/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.450.0.ebuild b/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.450.0.ebuild
index 57d9c9ce9a23..27fdb229a9b9 100644
--- a/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.450.0.ebuild
+++ b/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.450.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Database-independent schema objects"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
index 0d36db9f644c..8a7a098ca830 100644
--- a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
+++ b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="parse and validate simple name/value option pairs"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
index c5e54dbbcc6c..6b548c03bca2 100644
--- a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
+++ b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Declare version conflicts for your dist"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
new file mode 100644
index 000000000000..8a9a150032dd
--- /dev/null
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MICHIELB
+DIST_VERSION=0.22
+inherit perl-module
+
+DESCRIPTION="Object to handle .desktop files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	>=dev-perl/File-BaseDir-0.30.0
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/05_pod_cover.t t/06_changes.t t/04_pod_ok.t
+	perl-module_src_test
+}
diff --git a/dev-perl/File-DesktopEntry/Manifest b/dev-perl/File-DesktopEntry/Manifest
index 2b465b641041..b003cbad1b25 100644
--- a/dev-perl/File-DesktopEntry/Manifest
+++ b/dev-perl/File-DesktopEntry/Manifest
@@ -1 +1,2 @@
 DIST File-DesktopEntry-0.04.tar.gz 13784 SHA256 d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb SHA512 9582f1f226054a82aafd7cc74a924f9a635fa55f61b24c5bd4fcb30ecc8658ab098d782514b0df2bc29f66032cc416aa674bf7fe402e2afe96f018791265393c WHIRLPOOL 0f1a2f4fa379e5fa3459983b0e4fceba3d245ade34463134a09ae29c36281cdd4516552fcd484b92d31d0cb414bd04b19e87314b536f49c4cb00ebcf82230e8f
+DIST File-DesktopEntry-0.22.tar.gz 18366 SHA256 169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8 SHA512 f6a0f2a91c66ea3e5ebac1e66f82317c4109d8d3e2211b4e84cd870b9df07320c03ee0d026e89f788338a1c02152c77e36402684da4f5a7093eb3ac21ff584a7 WHIRLPOOL 8ee40f1269318b0240ef028aa6a3cb367f5dc0e1280b2bb33439612f0f2e981b8aed18570ceecaa6a7bb2b4466ea5f391e5f27e0d135f093dbb512f893c811b4
diff --git a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0.ebuild b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0.ebuild
index e85b94ee7412..8585cbbd2610 100644
--- a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0.ebuild
+++ b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Very fast base to base conversion"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.410.0.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.410.0.ebuild
index db5baf005ff8..8f6d01166311 100644
--- a/dev-perl/SQL-Statement/SQL-Statement-1.410.0.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.410.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Small SQL parser and engine"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild b/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild
index 5aa2836fc629..aaddc17c35be 100644
--- a/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild
+++ b/dev-perl/Text-Soundex/Text-Soundex-3.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Implementation of the soundex algorithm"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 13f8c5260982..3fd538b8eebc 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,3 +1,2 @@
 DIST oslo.messaging-4.6.1.tar.gz 220648 SHA256 be0499c3c2bf22f7ab3934bd2c331af6eea47f8c6508774d209a8028e9582421 SHA512 b63a3e6d68261852a09a238a404459e6f0e23b60bab863702aa044bf2256244d86bdaf86a7eda8f13a73d87d7599ffcee4a8e7ea2df230ff7a7e3f84b8279d6e WHIRLPOOL c7d9b341eb243f382db2e39b90f4b430dd75b0445322fe228e26201ae75b06fec42c27f80a1f003dbb7c03382be94b1ccca3ed96b3bfd4f14c723c496db77a5f
-DIST oslo.messaging-5.10.0.tar.gz 274071 SHA256 9abd5e90dd7bb6521f9bc083e692eeb2cc0723c3b5b8c1449e89da5491cf3055 SHA512 a66e9096635f3119607c343bca710c6d55a7540140af7c06e39892479a911718085f8712a063498979c1266adc1b7a943884adcb0c41d996d0675e46bbc52ac7 WHIRLPOOL b953fc0a3d393ce9e3118ba4077060d3012f88c745de8188da0579cceb04a318259faa97deb067f94cca0d1f62194bf0deebcaaa6976726f41b2bffb99a9152b
 DIST oslo.messaging-5.10.1.tar.gz 275170 SHA256 0781f39710f87d8b895f5013fd3ba4a5d038921c5ca7bf7e2628b29c551143a0 SHA512 4ec16209a94063706dd64318f15814457224d6da5a2d42755d6b4dd9acd6a7c0944cba0cfa89824e71bbd7e8c7ce25ab5e6cff4fb8c46fcb883c11d23274c89a WHIRLPOOL 3f7694ffbf2dd8c7aa3062b8032aec1eda479a8b8579bb21fa6e20ab06e62949729dc1394a9330fe94cb619938135d64923015ba5f3c8fae8ad32f7f31000eee
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.10.0-r1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.10.0-r1.ebuild
deleted file mode 100644
index 4f1b1cb52fd5..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.10.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.10.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.10.0.ebuild
deleted file mode 100644
index 126a84e53695..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.10.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.10.1.ebuild
index 4f1b1cb52fd5..76500ff126cd 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.10.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.10.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/paramiko-2.0.2.ebuild b/dev-python/paramiko/paramiko-2.0.2.ebuild
index 6a5d2e62f679..c0d0a40c11e1 100644
--- a/dev-python/paramiko/paramiko-2.0.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.0.2.ebuild
@@ -33,7 +33,11 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( demos/. )
 
 	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
 }
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
index 6a6819d26c88..14ceaef54469 100644
--- a/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 03df47ce7080..fc4e99c1e98d 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 IUSE="examples ssl"
 
diff --git a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild
index 542a8fb74321..c04b93df487b 100644
--- a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild
@@ -21,14 +21,20 @@ DEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
 
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+}
+
 src_install() {
 	# ${PV} instead of ${PF} is intentional
 	local dest=/usr/share/doc/qt-${PV%%_p*}
 	insinto "${dest}"
 	doins -r *
 	docompress -x "${dest}"
-
-	# these files are not shipped in any other version of qt-docs and collide with qtcore
-	# bug 597026
-	rm -rf "${ED}${dest}"/global || die
 }
diff --git a/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild b/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
index 08c581de6ca0..05971627cd6f 100644
--- a/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
+++ b/dev-ruby/astrolabe/astrolabe-1.3.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild
index b3176d244cb8..ab0c1cb815da 100644
--- a/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild
+++ b/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 4800d5f812fd..ca12e72ec1a6 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,4 @@
 DIST coffee-script-source-1.10.0.gem 58880 SHA256 e0e341d3717e0bc72c9e0d7113bed29ee8449723493ac8de5d83ce9cd3788ecc SHA512 09b8a25f185feac94e6d0226accdaf2bee207995a46ede77b6daa581afce7b5c2fc87acc4660d8467fae881d15b2c78c64bc5f1084b68a51ac287efe09a3b053 WHIRLPOOL 6783c1656a67af168c198856cdf85b4fbb518e7af3f25bab2623b00258ef465d97cdfd18f1fe1dfd5156e791fadd0caed1a63ecd30ce2f01dca1b6fa7b436dd6
 DIST coffee-script-source-1.11.1.gem 64000 SHA256 096ee2a4c29e286077292da31675199cd7a0e9e308319e86410e01f42984da75 SHA512 5b1512682e261b71b44a73ce0606f1619810c55410fcc98fe5fd892f78afc6fddd90881ef3263c8c102864e7d80ddbfee9a85512f452da792ef0a4161dff6db4 WHIRLPOOL 435c49fb8935352b65eb1437aabb4a7d7929106cb40445200ed98fb87224ab6927f0c1c3238cdb159f57cb3f883024800ccdaec41770c142fc0238b79f64e0da
+DIST coffee-script-source-1.12.2.gem 65024 SHA256 e12b16fd8927fbbf8b87cb2e9a85a6cf457c6881cc7ff8b1af15b31f70da07a4 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb WHIRLPOOL 069e5dd89a63482a0a338a150056ece984c9dce050fe7da5eaf469a7233ff94b75f24e78ce536836743ee4ffefa066b4e996a6d851aa95879176ca709deda332
 DIST coffee-script-source-1.9.3.gem 58880 SHA256 d2e34f9541e1bb57131dc64881b7bdc0835706216f06a13f6b3a73e4da0ced45 SHA512 099a656499b72bd532d5c6d365f168f82dfdec91c79edb385ed939f9d78055926846c1a03084b41aa1e789f5b32873d5d86e8079bc081acb61654996371c829b WHIRLPOOL 89df9e62d02ca8a275618deb8852a019e600bccdae278565f01cd467269715b64a9b8aae6fa949ca65997c902aa3b6381d13d2c17a5a1f3f6e7d1a2f0354cac3
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
new file mode 100644
index 000000000000..1f6b7ea92f08
--- /dev/null
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
+HOMEPAGE="http://coffeescript.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris"
+
+IUSE=""
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index 847560858413..12bd8c6ebd1f 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,3 +1 @@
-DIST colorize-0.7.7.gem 15360 SHA256 d6ab95a5fcdea3c36c3327d38c1e79e2950ee1788506d8489ae35db330937a99 SHA512 ac55d281a3ac7aa72c02ecdc27a1936410cb2754e48e0c23b98eba5e98a8bf42e362fe3a86e73c12ff5445f2e0a92a7c561e82a4d85aae0ef08a9855b056f359 WHIRLPOOL 43576f9fcc4880644b610fcc7bbebf8c6a72381d40d33fc7c1d44f6145cc78998ad6bfcba3b5fb52ecb1fc9f15e1e2cf7973888a1bcf040597bb1b0abb8e9143
-DIST colorize-0.8.0.gem 15872 SHA256 43c0daf332260b67d844487b2975830d31d1ca49fd427f9d2468bd52324fb1d6 SHA512 7bd7899c2e38e75f311aadc1762f5da4ce0cf94f3a4f9304447f915a09d8159edc66db746728cb9f1e4f98ff52c9152225aa7b724865c8875379f0c9f5d1218c WHIRLPOOL fb739c96fa2addd9192f834f8dc3f1cd905f410d3bed49f1d36876cb6b3e0aed2b4d203d12318b262fe51d3cf6f11024e583861876bde9ab06b22b19f3991ec7
 DIST colorize-0.8.1.gem 15872 SHA256 0ba0c2a58232f9b706dc30621ea6aa6468eeea120eb6f1ccc400105b90c4798c SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72 WHIRLPOOL 581740942909c50eabc40a7dbb1a07c41697d30adab760e63d165f63c0c323582d3b57231cf8429a334df0737f7ca1b7ddf521b6a156a9ba2aacc0bb8d0583e8
diff --git a/dev-ruby/colorize/colorize-0.7.7.ebuild b/dev-ruby/colorize/colorize-0.7.7.ebuild
deleted file mode 100644
index 936f53ae36da..000000000000
--- a/dev-ruby/colorize/colorize-0.7.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
-HOMEPAGE="https://github.com/fazibear/colorize"
-LICENSE="GPL-2+"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]ode[Cc]limate/d" test/test_colorize.rb || die
-}
-
-each_ruby_test() {
-	cd test || die
-	${RUBY} test_colorize.rb || die
-}
diff --git a/dev-ruby/colorize/colorize-0.8.0.ebuild b/dev-ruby/colorize/colorize-0.8.0.ebuild
deleted file mode 100644
index 212d7e564672..000000000000
--- a/dev-ruby/colorize/colorize-0.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
-HOMEPAGE="https://github.com/fazibear/colorize"
-LICENSE="GPL-2+"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]ode[Cc]limate/d" test/test_colorize.rb || die
-}
-
-each_ruby_test() {
-	cd test || die
-	${RUBY} test_colorize.rb || die
-}
diff --git a/dev-ruby/commander/commander-4.4.1.ebuild b/dev-ruby/commander/commander-4.4.1.ebuild
index d052dbc0b49b..9405544f456b 100644
--- a/dev-ruby/commander/commander-4.4.1.ebuild
+++ b/dev-ruby/commander/commander-4.4.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/plist/plist-3.2.0.ebuild b/dev-ruby/plist/plist-3.2.0.ebuild
index b05405ef9e5f..29d0804c6033 100644
--- a/dev-ruby/plist/plist-3.2.0.ebuild
+++ b/dev-ruby/plist/plist-3.2.0.ebuild
@@ -21,5 +21,6 @@ IUSE=""
 all_ruby_prepare() {
 	sed -e '/gempackagetask/ s:^:#:' \
 		-e '/GemPackageTask/,/end/ s:^:#:' \
+		-e '/rubyforgepublisher/ s:^:#:' \
 		-i Rakefile || die
 }
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 0fb7339a9d43..c48a4de2f336 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,3 +1,2 @@
-DIST sshkit-1.11.2.gem 144896 SHA256 610cebe87c1c016693e2d80bb5e5411961a0405358bdba6a6b3f11d682bfc125 SHA512 11dc614eb79967b265732c0ec99ecc35545ec0c083f8693f0596373560ba58e6a7781b285037d81aa0325beadd6fe1c0aa0f1b7a760dbdc32ad6192ecc438dfc WHIRLPOOL d49c18288092b987c5548943e0fa92d64aad21bea9e11384bca06cf935ef26932ac6f830e2b92d06a99b23f774594962eb5fffabb888ab79638c6c389500f339
-DIST sshkit-1.11.3.gem 144896 SHA256 9448311f00d40810db9695460f45dbe879a8420c4200c8a11e9777df44def872 SHA512 037793b24159761fcd44a40e958edcefe0d362e4859d535b65031d800673c2a683fec617be87d13d70698e122720700ce6d0ffd2980aec5d951e303b37894d65 WHIRLPOOL ce4018f8a2a123d0eca883b92a8787b68376f25c9d0b09ed2b4e86b4448d6ce2396c4b4c2909dae69f6ec25eaa75c2913d2a0f696a552d499ddc3ec11aeea490
 DIST sshkit-1.11.4.gem 145408 SHA256 15fb0b96854d3c85b2a81fababfc369505519a144d5c396bf60a41961f5cbbeb SHA512 51b02bffc2232a33678ead346172701229cfefce86ea22bb68bba10d03971e2021e2eb6babb9646159d7b98b01431e69dd37250ea3ec660820ef65b55b8ad634 WHIRLPOOL 57aa83aaf0eac8de448b3e48c208a0e618482320ef384e18448255ebc4988a5d8d7ceea457cbe51bef266247d272690286c7cf38a50573e374019b1e907a8ad9
+DIST sshkit-1.11.5.gem 146432 SHA256 546948e1c33c1fb748455d25967d7dc06d592e59d3408ce04ebbe1950e5430b1 SHA512 a99f2be197038145079b6faeb5eb51f98cfebd43b07e47d6b3a771e4fd34f8f7fcbc0183e19b3ada55ecbd25a1498d63a6e7966c47c8af548a850cd3e9d70d9d WHIRLPOOL 9b91099a40f8c532a1ff1b39c151ef70184c4e2527c1b4fe454800b582ea5599fc2238d87962955b0058f2fd0144b26fb64caf4b84a4f52e6d98ebc1de45b70b
diff --git a/dev-ruby/sshkit/sshkit-1.11.3.ebuild b/dev-ruby/sshkit/sshkit-1.11.3.ebuild
deleted file mode 100644
index c8ee20de483f..000000000000
--- a/dev-ruby/sshkit/sshkit-1.11.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.11.2.ebuild b/dev-ruby/sshkit/sshkit-1.11.5.ebuild
similarity index 91%
rename from dev-ruby/sshkit/sshkit-1.11.2.ebuild
rename to dev-ruby/sshkit/sshkit-1.11.5.ebuild
index c8ee20de483f..e974374fe1cc 100644
--- a/dev-ruby/sshkit/sshkit-1.11.2.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.11.5.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 # There are functional tests that require vagrant boxes to be set up.
 RUBY_FAKEGEM_TASK_TEST="test:units"
@@ -31,7 +31,7 @@ ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
 	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"' test/helper.rb || die
+		-e '1irequire "set"; require "pathname"' test/helper.rb || die
 
 	# Fix assumption about parent directory name
 	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index 14ca45daa823..acd3e741d058 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,2 +1 @@
-DIST tokyocabinet-1.29.1.gem 18944 SHA256 e1df73a0101532a606abeda37bee483e3707e90ddb502631ec0b028f58fb1fb7 SHA512 c6614644996d2182f07c1f1e025184b42facadaf84dbbc4106ba754ff98ffaa8aa098406dda51ad86eeed7806c89e04c9fad62d2798c63c7203a734de3ab39f8 WHIRLPOOL 00ce07794dba172884f1762e6fcaabb253293bdc7b22dcc241ea83427ea39e08b95e2821138235250d2b9cd370001a921de6cccbeaffee69eaa9960070bdda97
 DIST tokyocabinet-1.32.0.gem 18944 SHA256 2ca4dd54c58d3432a1c876e897c0234422f1f2c451d7171f02186b1c5f0409af SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3 WHIRLPOOL b718bc4262c7bf85beb5ce7c7f2ea7f65b1346fd692ddf405117ea66af0b66059d9cd23529895945005aef8283ec9210d72d128ad04abf8f45f82b26ca520eed
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.29.1.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.29.1.ebuild
deleted file mode 100644
index 68dc42b9c032..000000000000
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.29.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND+="dev-db/tokyocabinet"
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake install DESTDIR="${D}"
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index b278b1eadf38..99bf5069f550 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,3 +1,2 @@
 DIST trollop-1.16.2.gem 22016 SHA256 8f96479851ce7c5b6c33dcce2ed13d34e5786f2b22bde4e680c608de40ba393b SHA512 ad99aa2c0c3b9a8ce7fe0e3f5fc1ab6f600dda5229cb5a15cdf2a3dcc6ffadb8e386a695eebc07b86742c7d62a99794e57e86263a6e03f3bd5f883ad9fe1959e WHIRLPOOL b6144aa7f9ab2ec62e4f7d01681d0c04445a5a45749abef6d07502ff37bdf9a93b46acaf31936e9cc2d0eaa236723f8685a99f41077235d649a6a49698410dbf
-DIST trollop-2.0.gem 22528 SHA256 1f3eed108cf6dbceedf5a548b07ae788dc57893333a06b7aaab2a8d3d599e547 SHA512 325a58ffb1dae96a51497e671b3237e4ae15b46837a74f787f27e5419bf76e9870de407fe0004b6cf489f038cea44e7feed3a83e92f89d68587436c59fb62da0 WHIRLPOOL 9a2527fb42282724f997a7d9527daf89852bedc464e5f6aac614b6fed61abab0df82976cc254458527839ae697c2372e7978b22326bcfe8728e62d068d8d9cc9
 DIST trollop-2.1.2.gem 26112 SHA256 88422e8137b1e635ed07f6b8480c2c2a16d3ac1288023688c4da20d786f12510 SHA512 afebe220119476fe3b992f430c79c9de06a6b5398f3ccf957bc0e3b3a1bcebd47a350a94882b3c46aa4db93c70002f3d4adabfe95d0338f14149545c7a9e8dc3 WHIRLPOOL 1736490b908bb7be2206fcaed4afdded18255647e90b9519c7214a044b49c00f78d0b614107388a99a19d3ba74839ae2ffb3266e48f650b5eab0c99adbae610a
diff --git a/dev-ruby/trollop/trollop-2.0.ebuild b/dev-ruby/trollop/trollop-2.0.ebuild
deleted file mode 100644
index e3bd61f0a43b..000000000000
--- a/dev-ruby/trollop/trollop-2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Trollop is a commandline option parser for Ruby"
-HOMEPAGE="http://trollop.rubyforge.org/"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I lib test/test_trollop.rb || die "Tests failed."
-}
diff --git a/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild b/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
index 6062035452e8..d7a46f3230af 100644
--- a/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
+++ b/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
index d996e166fd04..e78eee892841 100644
--- a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
+++ b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
@@ -9,7 +9,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 inherit ruby-fakegem
 DESCRIPTION="Gem provides enforced-type functionality to Arrays"
diff --git a/dev-ruby/warden/Manifest b/dev-ruby/warden/Manifest
index 4616846b1042..4dd0b9d37a5f 100644
--- a/dev-ruby/warden/Manifest
+++ b/dev-ruby/warden/Manifest
@@ -1,2 +1 @@
-DIST warden-1.2.5.gem 32256 SHA256 298ac90db5f51ed3562b060806de41dc629a912967f899b7345955353a346472 SHA512 cf6ae73b7b2e8e412254ceab18eb428990e32f0519e21da1a97d24151acda4f720c61b1c114d8a094a92cb978f76baf587b78e007b274bedac187138413cd5c8 WHIRLPOOL 75afcb69dfbf7dccfe19107895b51eb6f149741f15890f14974d8360f01d4015015f6cb738d27c0fdb225b403ee82324266c246b82c0bebf3b40e31d5de94068
 DIST warden-1.2.6.gem 32256 SHA256 34e0383f0d97c07731e9841b58e54665291fc94078edad6be7228c3bb7adf711 SHA512 dc2ad118faa90f812eb615fe9c41e1edb1564812f7bf6a7759a782825757c899082956ba318956bfc745c23eeefe41dcddfa9f605ef76bd12ec264f8b85f38d3 WHIRLPOOL 6c624ef2df34052a6ba09374e0a37dae312d3618ab31816c4f43eeb7e443d92cba2a804e92b4f78ce34a77c268d993fd4f4883343b3715a5d1a99b61db178b18
diff --git a/dev-ruby/warden/warden-1.2.5.ebuild b/dev-ruby/warden/warden-1.2.5.ebuild
deleted file mode 100644
index 0847244305ca..000000000000
--- a/dev-ruby/warden/warden-1.2.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="README.textile History.rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="General Rack Authentication Framework"
-HOMEPAGE="https://github.com/hassox/warden"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/warden/warden-1.2.6.ebuild b/dev-ruby/warden/warden-1.2.6.ebuild
index 0847244305ca..59a9f423a18b 100644
--- a/dev-ruby/warden/warden-1.2.6.ebuild
+++ b/dev-ruby/warden/warden-1.2.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="README.textile History.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/webrobots/webrobots-0.1.2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
index eaf85376364a..bf8a4cd40759 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index a105770fb5df..0c0efad321f8 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,4 +1 @@
-DIST websocket-driver-0.3.4.gem 19456 SHA256 b829ee1da54aa1374ca0cc143a83f1f5a55ea9f318021f06fec4b34a2f47b038 SHA512 c3c2c98bd5057a47e830fc31d56f88ad376ad71b473963fa20c1380de8a9c95b458cd9545b676f7adc1ed494664714648aec182b6b3681c38c87248370f1db64 WHIRLPOOL 019e6527dcd034ddfd3652c1f71bbeee01e62dfa59e7c70d1986b64bb05364122cc7d2c4bee2c2c0d4559e55724f6def40a1b20ad47e6fa153f5b7e8b3c0366d
-DIST websocket-driver-0.6.2.tar.gz 24186 SHA256 531b5687169e837c6c6378cac0716710143691138caa95ef67a5bb2a14a46f71 SHA512 c4a7d91a6f3c882029c50723da90cf5b1daac725bc1b4ac1bb5136b1fbb96f6206f9b304ff9d404399ab1d1995a39a9db63123fff8fd9b80241cc16709fc7200 WHIRLPOOL 64c4134ec7ebfaba790cd68863ca3989282444417a84d058a034b14814e02e8bcd11744a33739e45a7cc8009e30bbb8333990626af44f8df6b411478cd7d8120
-DIST websocket-driver-0.6.3.tar.gz 24562 SHA256 b326151fdde8a0d5c01035547b570d2e8feb1aa9c0344e034cfb954d1df21154 SHA512 ed5b22ddf7e2e592942e828076009f07c3ad4058b213aa8b44ac5bcf952d21484464a082f6f45772368dd61fe0dd9eb60732897561f757f960167d86d4e99c74 WHIRLPOOL c159ed70052edcb9cc4e5c3ddda7ea86eb160da0e3a7108ca36a26ce13437995b021e4407ab6d29cfa57fe61c72932350f360becfd44bd16b54da1ff0384f40a
 DIST websocket-driver-0.6.4.tar.gz 24516 SHA256 3af1b2cabe12fb7845836e362923e5136106e621b8bac9600faba4a845286fd9 SHA512 5d84586a0ec396f2c55eaf65db95ce4ebf427fdeb261c47595667561c6c76730eed0e2971fe7919067a39427ca31b2805be2e7443661494946165c0d9bc9935a WHIRLPOOL edc1e823adeaca8fddd6644cbb83310fc9185a18fe5c8bf41d13c8476ed7d7862f6ad691fa6d4926cf1d2729bd522d44a1df3e824172363abd84212f14784fce
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.3.4.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.3.4.ebuild
deleted file mode 100644
index 2a25718a4eb4..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/websocket-driver extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/websocket-driver
-	cp ext/websocket-driver/websocket_mask.so lib/ || die
-}
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.2.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.2.ebuild
deleted file mode 100644
index e28f5ba04cfd..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/websocket-driver extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/websocket-driver
-	cp ext/websocket-driver/websocket_mask.so lib/ || die
-}
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild
deleted file mode 100644
index a22cd10be59d..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/websocket-driver extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/websocket-driver
-	cp ext/websocket-driver/websocket_mask.so lib/ || die
-}
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index c79d34929b98..41d84595a1fe 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,2 +1 @@
-DIST websocket-1.2.2.gem 26112 SHA256 e42a150316fa957b49da39308338b33c3f8ea9bb8a7720d26a042547e4d32cbb SHA512 a79e87a317a60c021f988edcf51a1fe2e0eaba44a152db1d74d81ac0208ffaa9483959bb162d56cd5c7b916da224bae9598b42510fa24fdcc64ad34e46c406c8 WHIRLPOOL 795bbb92423a382d5707cdf9288b86d7964972fc2d265971cc46875a5901fafb29bc99bcb03fc88a80616f09e3b45c626f3b5681311e2b16dca4226491f74227
 DIST websocket-1.2.3.gem 26112 SHA256 c0eda9f2eafc124ac9cae19d0f6df881c4a235fe32edecceab3c18ed2f110c69 SHA512 fb98517bc81463850d10bef95efaf5c3297519e3e106d3fde1b97559434cd19d272c60d5875287e171757936fcda0eda385f05317dab56e48eba833433ccfaec WHIRLPOOL 34391c12788bc8b362c9fd4a7f930bcfbbc8995f231faec4af1ce8dd623daff8a1c7fb8dc98de079da02b67b510d36be91a16f6fcce60cc948ce7955261d5563
diff --git a/dev-ruby/websocket/websocket-1.2.2.ebuild b/dev-ruby/websocket/websocket-1.2.2.ebuild
deleted file mode 100644
index 2d59a56d8d1c..000000000000
--- a/dev-ruby/websocket/websocket-1.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
-HOMEPAGE="https://github.com/imanel/websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 30f021a6e911..f2556fd0d23e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,5 +3,4 @@ DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
-DIST cmake-3.7.0.tar.gz 7359368 SHA256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 SHA512 badeb81ea5b2a765d0ae222d6c7612eba570f46b3645ac8a22e1cf5ea52648239c707e80d51c1d31f8e5b15167e37e6b4d9f6308280560b11feddc3d2fa745cd WHIRLPOOL 38bf6f2861544024282e6d1fc97824c32ebb824256ebc2513ad4b4698f66803354de75d1692a63515b2b0f587cadc52d3c9e6a1b367360b561f34f1452495566
 DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930
diff --git a/dev-util/cmake/cmake-3.6.3.ebuild b/dev-util/cmake/cmake-3.6.3.ebuild
index 7a5d4fc9fbdd..73f584cc146a 100644
--- a/dev-util/cmake/cmake-3.6.3.ebuild
+++ b/dev-util/cmake/cmake-3.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
 
 LICENSE="CMake"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.7.0-r1.ebuild b/dev-util/cmake/cmake-3.7.0-r1.ebuild
deleted file mode 100644
index 7bda50dc1570..000000000000
--- a/dev-util/cmake/cmake-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    Qt5Autogen, which breaks for unknown reason
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
deleted file mode 100644
index 052cc30699fd..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
-   else ()
-     set(BUILD_CursesDialog 0)
-   endif ()
--  if(BUILD_CursesDialog)
--    add_subdirectory(Source/CursesDialog/form)
--  endif()
- endmacro ()
- 
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
-               CursesDialog/ccmake
-    )
- 
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
--                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
- 
- 
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+  TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
- 
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
-  #define _MSE_INT_H
- #endif
- 
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 9b20e6434bdf..4b30ee1d1bce 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,2 +1,2 @@
 DIST kdevelop-php-docs-1.7.2.tar.xz 32892 SHA256 2dff2f54f631296c87007be84a0dc439d328d473717577c0d1450a9fc7e6e828 SHA512 5bbc3a4a61fa87b96182bfa1b3df28f26a35e4eb7ee021c822a031cb71b5900b53bacbac0d4892d8ff021dcc90b74097a0d67f31b17a4c3b7248170b19b54e16 WHIRLPOOL 5ef5309986dc42d41fe90333025075b132d3bfe3107802b97e54e4a1f2f36c37234b87dad3fcaf6d15ab3d79567fd4dae1ae1155403e7f1dfbd3bebf8d2ab32f
-DIST kdevelop-php-docs-1.7.3.tar.bz2 19321 SHA256 2288dcc4b6d204bf55d65d9ab1dc4a1e89bdcc92aa8c3157536d7a2c6645f5f4 SHA512 51ba61911831278e761a18f53ff648d36586bdbc5fcad9ec9d7a8424e76b3a4acdc002e23e0a38783ec3b4376e4297f042edbbdc92559297c20921c647375b81 WHIRLPOOL c8f0ce80e6e18c281f03dedae56463570f09a3f1f432d0d48919a9c41a2d83408620dfb497947f5f6f5a39b0068e5fce6c605336cf6c38431845cd2837668105
+DIST kdevelop-php-docs-1.7.4.tar.xz 32788 SHA256 7b4022389e5bd07bf0666ee0a436e424ef30d5413ce6acd186b7345669b202b1 SHA512 3f00f699527dbdb1a927c0b6e9ebc38bd8b875b5c1f896d4a947c18bde6e338c00bd01345e0b0220eca9a519ed76301ef378518045d60e3d3db6c67272bd7598 WHIRLPOOL 821f4a1c5245dfbb26883962d2dd3e0f86c049e18a4c54de55fe434c4139765a1baa44259a8946beaf67f47051a0ea4f84f2049ecf8dcdb7e39c859bd286a295
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.3.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild
similarity index 98%
rename from dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.3.ebuild
rename to dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild
index 1b4286ce7a00..ce64afc0c512 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.3.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KMNAME="kdevelop"
 WEBKIT_REQUIRED="always"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index fc349b8ff1b4..4279b79f2961 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-php-5.0.3.tar.xz 676568 SHA256 76fd1f665a9e0f6a7850d5b2f145b2567ca5442eaaa1ac3b6c8e70709a9e3210 SHA512 8535d54efc4653b07676660ad730a7fe692656f6f312af772e14b3d1a9a955d5af807868a65a4b6842c368af9a4d8ad8589ed99ecd67d7ff36b5c9e81d937e62 WHIRLPOOL ab136737ba3f6bb47c7cfecd063e0e9fe5dfe86889f0867b113abcd4e875a217ebd7325d2d9ed5092f90c6db40bcd66a95c695059f8a24e3c0c7cb6ddc323b60
 DIST kdevelop-php-1.7.2.tar.xz 658060 SHA256 75de9a5afe32ecaa35eb14e1ae04dd9c6d3e9abf87274ca4537fbdc3b296a369 SHA512 419ac3865c15ba30997e08f655d4ba61877ff15b6f3c0261a52a74e7d158e7a82a638326d2ccae1a435b846f40f76723807ff318ea3242651fb8fee263cdf5e1 WHIRLPOOL bad67fdbff98c2d47dd3034f56abafbb7ff8d1fb17aec3e7004177a50f1f131808b56d80f3c89bb234613ab71badcf2fdd4e67420a3902eda33f2f94489ca2f0
-DIST kdevelop-php-1.7.3.tar.bz2 691363 SHA256 6b3583560dc9c339d74c51d9774a3ff342e260b285c8d9bd8f7f89f47a7dbf69 SHA512 aa052f546e84ff002cbe899ce9b892935ddb88d959ed2ea695c020c59de6f9a706106bcf5fac11dbfb9a015199286f8d729affe1e0d40842867971c99143cd41 WHIRLPOOL be6ce21cbd0f91a110192194cf0892c5ce3c3cf5c847a1a42e4790e2274043d5ed5e6f3f332cac8ef4f340284f031b838ac415629bb187501a00e2abe2b3ec83
+DIST kdevelop-php-1.7.4.tar.xz 658488 SHA256 ff360e69cd9a125cf70d7613d26ac094865ffa7966fe6419220841474f39230e SHA512 03985e31bb7d57a430b6bd34070c0622abe46f98aa224d863ad011db181f53b54bb645466b30898c8aa9e65c214b304bce5232b9fae13bf919a543bc09a87780 WHIRLPOOL ca80bb9be95921b1a7d85a38dc943bd8757da0a71ebcd13bebbb7b90a75ac330e8f62bdab95c1d45af37235e849e7fc934e1bd21744949563d6b10ad78805877
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild
similarity index 98%
rename from dev-util/kdevelop-php/kdevelop-php-1.7.3.ebuild
rename to dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild
index 5a8147a6c30f..63c7b4227e5b 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.7.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nl pl pt
 pt_BR ru sk sl sv tr uk zh_CN zh_TW"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 130783fc8dee..f1ff6a178d91 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695
-DIST kdevelop-4.7.3.tar.bz2 4826588 SHA256 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 SHA512 e6d410bda001cfaed7c15383497992d6aad0a878c4c6f786c154dc9de581139baf05e592a8355481dd25c7f8d3b52b3a9516187e1e85c1f229ba32bc7cc57636 WHIRLPOOL 521b58b688344884ed178b9f7eaa87f11c0eb7e631a83c33ba4b6b23ae49ca866da667e2e2d726ad17ea3bf311b66a2f2695627d50c4dbbed8074bb338270790
+DIST kdevelop-4.7.4.tar.xz 4444352 SHA256 cdef56196364eb97a4d9f15b6d47e12d893ef0bfa7100855f532ba7a9ff69130 SHA512 4880e5bd42c68bac90298835dbe01ecf93b824ded8cb7e3e6e26990481d3daee74ab4bcfa11e99620dd711c5d3db62019e2c4b7ea0d638636f6b795f137d51ce WHIRLPOOL 420ba37467af1cff9f126988cf677460a12553b26ad04f0343a4d11c343727bc00f116de87b4cae754f362be84f76c5f0eecffc6a2185465ced91873064bc498
 DIST kdevelop-5.0.3.tar.xz 5004500 SHA256 17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601 SHA512 5fa799412c5a847bdefeca3f339c3b17b7693761209f646b6aee35734abded234d871ec9763079db7a4236047d68b3ab9a89ac22a0abb8b7a23d4c67cf749444 WHIRLPOOL fa1688d2dfd5d94cf71ae397c9b6c96f0e8c0999c714a41932e9aecd9bea40159f9e39d183cac23a509f63666445b026e05905ddfc176e1e7673f78c9651438a
diff --git a/dev-util/kdevelop/kdevelop-4.7.3.ebuild b/dev-util/kdevelop/kdevelop-4.7.4.ebuild
similarity index 72%
rename from dev-util/kdevelop/kdevelop-4.7.3.ebuild
rename to dev-util/kdevelop/kdevelop-4.7.4.ebuild
index 042285bd6126..ef58d98e7a21 100644
--- a/dev-util/kdevelop/kdevelop-4.7.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
 pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
@@ -33,19 +33,19 @@ RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdebase-kioslaves)
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 "
+# bug 366471
 RESTRICT="test"
-# see bug 366471
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with gdbui KDE4Workspace)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
+		-DBUILD_cmake=$(usex cmake)
+		-DBUILD_cmakebuilder=$(usex cmake)
+		-DBUILD_cpp=$(usex cxx)
+		-DWITH_KDE4Workspace=$(usex gdbui)
+		-DWITH_LibKasten=$(usex okteta)
+		-DWITH_LibOkteta=$(usex okteta)
+		-DWITH_LibOktetaKasten=$(usex okteta)
+		-DBUILD_qthelp=$(usex qthelp)
 	)
 
 	kde4-base_src_configure
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index aeae5a14e27c..aa51721f37d1 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,3 +1,3 @@
 DIST kdevplatform-1.7.2.tar.xz 1929976 SHA256 0afcde7a746adb83b00f2bd6b02efb4022adbd61b6ba4325fb63b71902f1f4e4 SHA512 b95a1837b61d6c63cdd5183194ea70301bb32720df8c5317ba891a91c24c1e174aa69d10131024701bfe710f4848ac50059bc4513cf334d39415d37f4a445d66 WHIRLPOOL 4656a52becd50e9d827010e798941465731872b014400529fde4c45410d7f77d063c7fed237f94991742af997e845145772dbb199df74ae9777d41c2bdc21693
-DIST kdevplatform-1.7.3.tar.bz2 2417125 SHA256 195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b SHA512 a23712bc70a7b084541a0bb441e19ba30bf408e4046403367cfce98cf7cb60b1aa89d6fce466e5512f1d3ea93353dc0dc5b57b0953bb85e7319a4a14d5403be9 WHIRLPOOL b0deafac4013aaad4ab80ae87c5dabd033a522e935ba1569659cb8dd4e7f06b8e75910ffecc3b27c7ffe0687cfc2ba65a2d707e8fd5b96ad603d4a4b011f2864
+DIST kdevplatform-1.7.4.tar.xz 1934292 SHA256 21ea4a6c4e241e3b9d6f991ac98b2df8b9c45e17bdb416e836cefbde2d524574 SHA512 9293356782113abc026f063c0db9e82aff2c52631aa27fda9674c21d00d031c92853b358cf65f161910cc84e543e73fdabed01e8b326875ab7b253db9e4bb225 WHIRLPOOL 5531dc351f01c2e53ac62927beb7d1d33d5ae1771e445f32c035e89f09c688fd41c3781ef6960744bd29c3124d0797e9efee795945a8eb449d06aff1e4e596f0
 DIST kdevplatform-5.0.3.tar.xz 2018600 SHA256 643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4 SHA512 ef48c0de41d1fe20269400eea4d2b04efa04cd62caaa987e6814c5513e843c3cac030479a8a0576b9fc532d7771827fcc4acda128448ff34dec9fbd55bd05d55 WHIRLPOOL 24cbc44345867b78b669993fcc8d1b680c051cce7c6ce91761de14877f05e6f983f562fe99d0ffa2586611d7daee8d66a2a530f7700ae2c44832f9d980069099
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.4.ebuild
similarity index 87%
rename from dev-util/kdevplatform/kdevplatform-1.7.3.ebuild
rename to dev-util/kdevplatform/kdevplatform-1.7.4.ebuild
index f4ccb798006f..6b6d2b11ecd1 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.3.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DECLARATIVE_REQUIRED="always"
 KMNAME="kdevelop"
@@ -43,11 +43,11 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build classbrowser)
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_build konsole)
+		-DBUILD_classbrowser=$(usex classbrowser)
+		-DBUILD_cvs=$(usex cvs)
+		-DBUILD_konsole=$(usex konsole)
 		$(cmake-utils_use_find_package reviewboard QJSON)
-		$(cmake-utils_use_build subversion)
+		-DBUILD_subversion=$(usex subversion)
 	)
 
 	kde4-base_src_configure
diff --git a/dev-util/mdds/mdds-1.2.2.ebuild b/dev-util/mdds/mdds-1.2.2.ebuild
index bdb723486a58..4cac987a4f98 100644
--- a/dev-util/mdds/mdds-1.2.2.ebuild
+++ b/dev-util/mdds/mdds-1.2.2.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 
-inherit eutils toolchain-funcs ${GITECLASS}
+inherit toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 DOCS=() # buildsystem installs docs
 
 src_prepare(){
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index f2e2b99b38c2..867cc2658844 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 
-inherit eutils toolchain-funcs ${GITECLASS}
+inherit toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
@@ -31,15 +31,14 @@ DEPEND="${RDEPEND}
 DOCS=() # buildsystem installs docs
 
 src_prepare(){
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		$(use_enable doc docs) \
-		$(use_enable valgrind memory_tests) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable valgrind memory_tests)
 }
 
 src_compile() { :; }
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 1a3a5d71a8f6..795f3b286cba 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70 WHIRLPOOL 0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
 DIST qbs-src-1.6.1.tar.gz 934229 SHA256 72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 SHA512 6ccece4d2be457fb4a476cc134fcb997dc74d2d64b2a78ad281a618407f045562ef44257cebba05ff4cc0cfe019f6b4ba83096f2b76a7633aa78039c1dca6b7a WHIRLPOOL 928085e54826bb2f7f5e74c78fb392901c73a093115f733b8682a447d39479f08294483e288d3beb77963730f065961b6b1c2fcf3c2a4dd556677d7a7cb1360d
+DIST qbs-src-1.7.0.tar.gz 992213 SHA256 a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f WHIRLPOOL e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6
diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
new file mode 100644
index 000000000000..930b211f1125
--- /dev/null
+++ b/dev-util/qbs/qbs-1.7.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Cross-platform build tool"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("java\./true||&/'	`# requires jdk, fails, bug 585398` \
+		-e 's/!haveMakeNsis/true/'		`# requires nsis` \
+		-e 's/!haveWiX(profile)/true/'		`# requires wix` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/dev-util/scons/scons-2.4.1.ebuild b/dev-util/scons/scons-2.4.1.ebuild
index f3d55e33c060..fe04fc4727b6 100644
--- a/dev-util/scons/scons-2.4.1.ebuild
+++ b/dev-util/scons/scons-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild
index aed6e6321d94..fbce562b490b 100644
--- a/dev-util/strace/strace-4.13.ebuild
+++ b/dev-util/strace/strace-4.13.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha ~amd64 arm ~arm64 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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild
index d035d8f35cbd..0ff5821f2e46 100644
--- a/dev-vcs/git/git-2.10.2.ebuild
+++ b/dev-vcs/git/git-2.10.2.ebuild
@@ -37,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild
index da21d4f387e3..e301fc06c266 100644
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-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 ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild
index e4dac3d24dd9..663adec826f6 100644
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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 ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0754d7abf6d0..f1e41f7b8c76 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -490,6 +490,7 @@ _calculate_src_uri() {
 			case ${KDEVELOP_VERSION} in
 				4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
 				4.7.3) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+				4.7.4) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/${P}.tar.xz" ;;
 				*) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
 			esac
 			;;
diff --git a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
new file mode 100644
index 000000000000..223ee47ab5a2
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
@@ -0,0 +1,14 @@
+In C++14, bool -> T* implicit conversions are not allowed anymore.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=598639
+
+--- a/src/interface/weapon_menu.cpp
++++ b/src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return NULL;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
index 6f265a9455b1..17086e76ea79 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=6
+
 inherit autotools eutils
 
 DESCRIPTION="A free Worms clone"
@@ -14,15 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug nls unicode"
 
-RDEPEND="media-libs/libsdl[joystick,video,X]
+RDEPEND="
+	dev-libs/libxml2
+	media-libs/libsdl[joystick,video,X]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
 	media-libs/sdl-net
-	>=media-libs/sdl-gfx-2.0.22
-	net-misc/curl
+	media-libs/sdl-gfx
 	media-fonts/dejavu
-	dev-libs/libxml2
+	net-misc/curl
 	x11-libs/libX11
 	nls? ( virtual/libintl )
 	unicode? ( dev-libs/fribidi )"
@@ -38,19 +40,19 @@ PATCHES=(
 	"${FILESDIR}"/${P}-action.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-stat.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--with-localedir-name=/usr/share/locale \
-		--with-datadir-name=/usr/share/${PN} \
-		--with-font-path=/usr/share/fonts/dejavu/DejaVuSans.ttf \
+		--with-localedir-name="${EPREFIX}"/usr/share/locale \
+		--with-datadir-name="${EPREFIX}"/usr/share/${PN} \
+		--with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
 		$(use_enable debug) \
 		$(use_enable nls) \
 		$(use_enable unicode fribidi)
@@ -58,7 +60,8 @@ src_configure() {
 
 src_install() {
 	default
-	rm -f "${D}/usr/share/${PN}/font/DejaVuSans.ttf"
+
+	rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
 	doicon data/icon/warmux.svg
 	make_desktop_entry warmux Warmux
 }
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
index c190e731153a..b44f8c6375e6 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
@@ -120,9 +120,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+	sys-devel/autoconf-archive
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common
+#	sys-devel/autoconf-archive
 
 src_prepare() {
 	# Make some panels and dependencies optional; requires eautoreconf
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 9f6a238add2d..702bcc700cda 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-16.08.3.tar.xz 114868 SHA256 497a500a4587e8f4d8f6406b403b41086d5cfd033f3307c35682aba2ed4e06f2 SHA512 662694d28d7a932ce6b13954ac12bb3d6fc2b24c01bbcbe330e7d125c73cce9334767b57a39e64b8bdb9b06cb7f3d70281ae5f4bedd97eea8bd8d12c49f1dbd1 WHIRLPOOL 447f74bf43b9d4eb1b5da7088fe953c7b8d6abe40a1dbcf22105fd364e07f412d7f29db2861465dfff867bf22a3d889e5c1df5ac9d133dabdd10fd432ae3a7b5
 DIST akonadi-calendar-16.12.0.tar.xz 115180 SHA256 3019238ae34833298b803e2192759306ba6b1211963a72008d807a951c79def8 SHA512 f08a447586f5ba8f8e8dde998afa031598ffb82b4ee03b8fc33a5dce11b321ff9631a0c8bbcbf0dfc5211894400aa9599871f6e7e979c240bb458dcd6d88ff2b WHIRLPOOL e1a11b83886369e2ad17a60199f44e5848069ab8400d571e6c42e99d5c7e9a84adb7757325975d4d27fe2d6d819cafac1e406544ef3a0d4d0b924b262d02602c
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-16.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-16.08.3.ebuild
deleted file mode 100644
index e7415cafb4ae..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-16.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 5c11f01f1789..3896ccc7194c 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1 @@
-DIST akonadi-contacts-16.08.3.tar.xz 149272 SHA256 ad2e6f6169f2700cb8c252d7780eefbbc5bf57ed8dac5f1c868a9f78fac48d89 SHA512 b306b378bbef50c63c7e91b5a766a3448722cb0c6bd818f3684d802a6404dfed1014a3707271f47ef10aad8387574105515c115d71eb090ac83f559ad9561182 WHIRLPOOL dcd444616e13d2426eb2a5633445a1d515b97577cd7fd53fc16e13669f78e3e4c80a62c13d02cca4bc8c7cb422ecf5668bb41f9b190ca750d78ed0ed717402d7
 DIST akonadi-contacts-16.12.0.tar.xz 149280 SHA256 ecef2db9caa240d917e7a645597fe6d833dade77795e1efd18533f74f8d8b1c6 SHA512 b275c772b0c1eb040b4855437fcf91a47395010261314926c6d1bcfad6152d356fedff42351e741befdc72f14b4dd7d7219608afa16d1e20bf9666e643f846be WHIRLPOOL 5e8cd2a5abe1bb91451025791b28febb4c0e8a23cb03dae3388ba599024719ff14cb4f2b0640c427dfeb39fd5146d62ae08f5b67cb0884885740b10cf2c990bf
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild
deleted file mode 100644
index 9497aea71161..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-16.08.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE="prison"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-	prison? ( $(add_frameworks_dep prison) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 491deab86aca..9112b5321d26 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1 @@
 DIST akonadi-import-wizard-16.12.0.tar.xz 240340 SHA256 c53147af0cb66cddacaad90cccf0c04ee05129bc708c5977a6959d428662e7db SHA512 ec64edd734b53f4ee44348935080201bd45ba0baa9deb710a36bf793f0e05ec2acfa6ca5a5ba7d04af2946c9e5da1796343701154e2ec17ee7c5ffd7b3dfff06 WHIRLPOOL 9dec23ac5e0ef55990687fcf72e2cf4299f03fdd1603be3168f70a74a2df3316d2b70765b48cb0a55e0b227239a24a24aa98bcb48f5230af1b953a6a9dfb2849
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.3.ebuild
deleted file mode 100644
index c662df72ccd5..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-MY_PN="importwizard"
-inherit kde5
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kmail:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
-
-src_prepare() {
-	# importwizard subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${MY_PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 1e2baa83e362..e5482ffa9b7f 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1 @@
-DIST akonadi-mime-16.08.3.tar.xz 55440 SHA256 7d67146b1c3e9163247978d4f8b1884e1cfd71e48c792bbc0d3487ec1dc59aca SHA512 5ac99356b8e8fa060481f2913275cda7db8542754cfd0494f07b824e06c8ae52e8a2d7e8493b0d62043a0c04143b6c49bc6c66097b6338c8e1ab920342d0f867 WHIRLPOOL e3b463a78fa98ef7568a17f3533e399470b03ad20a07caf58c7ba9407ee5ecf26307352dc36ee03a9be2c40c191e94023bc71901e6fafafe16e03eada6a5b4b6
 DIST akonadi-mime-16.12.0.tar.xz 55600 SHA256 b91d124073a7882f3d3cdc739df888ea23c6ebacda79ca50a5a400f27a3ca418 SHA512 5fb1b80a7803debf71549ed2208fc76b368cf63ec8c6e82e313cbe654535c4a7a94b88ef4e17837ae0f818bee29a7838696a9237c6ffdf4a0487767db5b26251 WHIRLPOOL 5e83d59bbd91fc265af5671c7904911df93b3643243769fa5647ba40506ebfe4bd8a08e656995db612700f141cc09a64ea15adc0af9780b04e6f9af2bad3bd90
diff --git a/kde-apps/akonadi-mime/akonadi-mime-16.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-16.08.3.ebuild
deleted file mode 100644
index faa208f6de84..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-16.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index d8390d60380e..1e2dd213b252 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,2 +1 @@
-DIST akonadi-notes-16.08.3.tar.xz 18992 SHA256 1ab0727ed7b5e602d9808dc9060e2443ad7fca2f5e47da663197eccb3dd6b7ba SHA512 175d2c929dcaaecac33d95d9a9ec17613bd8a911195078475e955c03a9cd48f47fc5ec7c839a65388aa663e67b1995f351138b64bd6042811bface94a25cb37a WHIRLPOOL 084ddb4e89a69f7c922dbbaad90f537f3225222ec0900f394f971f2d4c6fe540f04b5bec71baf839c9878297e30dd59f4b58c7edd3703414992eb1e00f035ef2
 DIST akonadi-notes-16.12.0.tar.xz 19336 SHA256 361a25fcece0a9fa48293b869a579865f3863831074c49ef9a322877926d8a0d SHA512 29085d91465e4539ef9776fa6ab9994bc4ca0c998a1f76100c112ef226df5766dffc58403a90523470c0150da4d9666d9a72d3b03b001840d87b84da5290cd47 WHIRLPOOL bd1d98df899a50d9146438228b4e59e0251a9446b4df1f0a1f7cc2ffe6e18eb4508a85977d02e13b45ea5401dc28df3eaaf094be6a491a6119fef4972b771970
diff --git a/kde-apps/akonadi-notes/akonadi-notes-16.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-16.08.3.ebuild
deleted file mode 100644
index 05cb011da996..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-16.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_kdeapps_dep akonadi)
-"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index bd8fb4b59625..578e260f3c8a 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1 @@
-DIST akonadi-search-16.08.3.tar.xz 71820 SHA256 ede37db87d49c33391d4fb52822b3f0e7b239de04c166bca81d48ef1fe2e12f2 SHA512 9402ab466b1da4d56c0b611bbf7008a32b2394097367ec212140c32dadb5fd5f249f39b3a7662eea5842ae9d71200babbe10292b9367136537ab4d2efd887913 WHIRLPOOL a187dcbdb42dfe9200516d97c9c71019800edf8f86c4ff519778d74899a842470901d8189f66d5bd08c786acb2b71c276436bcca93023e5c61b880827e24197a
 DIST akonadi-search-16.12.0.tar.xz 72288 SHA256 55c44acef848e09e4f247ce82fcd7ad937741498ecbb1ecc9ba38111d3ccc723 SHA512 2784ebc47205d076dbf5fe0edda11ec44830ef4c3526700e701e1134d21f30c0cb3e61667bc52f47657d3ff43ee66e5b0dfb52f17f90fd76ef661f98ef30fd19 WHIRLPOOL c400ec93a907709bd5c330649226f2dec6428db5be78d7c791ed820df15f028f93a3195a665fd2a4742ce4e7835e96a0b19286f1109e9027bda34e21cee0af75
diff --git a/kde-apps/akonadi-search/akonadi-search-16.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-16.08.3.ebuild
deleted file mode 100644
index a22d424957eb..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-16.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert]
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index fa8b782756d8..ef15207c0da8 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
-DIST akonadi-16.08.3.tar.xz 1021916 SHA256 7ecb926d6f750ba2903b9ce96819cce758e4e7c9333a0f85fc93e4500a3d26cd SHA512 2413cc848fea63776adc46ef33bb5d2a0d800e1854d23237e6d57ee0d30a4ae9ccdedf6c71bce88866d94c4c1a5aa80448023cbc18ce2c81aaf4f413bd98c3fa WHIRLPOOL 46c9d120cb5cf2a14c395ff75d11cdde0d7bc51e7a22e4ee7730b9822eb3c6a74040469fe63e5941ded41af4c19eec651d70c8ae2f63b0e42d756ee6d591558d
 DIST akonadi-16.12.0.tar.xz 1036192 SHA256 281c8c0adfff16f4f43e428a22d483865ca2f54c0c2b24aae4ac8e85705712bf SHA512 6ee9bac8fad8825189976359626a7d2dea280fd4aecf5d4ce1d94d4fd6c8d0d738ceeba51a27564d3cfd5736b5e51e1078be04efa05efbdcdd8e84630c02d54d WHIRLPOOL 745103d8f4e80f93b6455fd4a181779cd2351561a7a6add6c69134aca4855f797c28194b6a82de77d59c8f8419f758f6f59ce3ac544ee1c4d610b4c8d4be1e85
diff --git a/kde-apps/akonadi/akonadi-16.08.3.ebuild b/kde-apps/akonadi/akonadi-16.08.3.ebuild
deleted file mode 100644
index 770f895e8e6b..000000000000
--- a/kde-apps/akonadi/akonadi-16.08.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://pim.kde.org/akonadi"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	tools? ( xml? ( dev-libs/libxml2 ) )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	!kde-apps/kdepimlibs
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	kde5_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}
diff --git a/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
deleted file mode 100644
index 773b523f9d81..000000000000
--- a/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Gentoo-bug: 530012
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index db0c100..cdd8c6b 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -80,6 +80,7 @@ bool DbConfigMysql::init(QSettings &settings)
-                                          << QStringLiteral("/usr/local/sbin")
-                                          << QStringLiteral("/usr/local/libexec")
-                                          << QStringLiteral("/usr/libexec")
-+                                         << QStringLiteral("/usr/share/mysql/scripts")
-                                          << QStringLiteral("/opt/mysql/libexec")
-                                          << QStringLiteral("/opt/local/lib/mysql5/bin")
-                                          << QStringLiteral("/opt/mysql/sbin");
-@@ -500,7 +501,8 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
-     return 0 == execute(mMysqlInstallDbPath,
-                         { QStringLiteral("--defaults-file=%1").arg(confFile),
-                           QStringLiteral("--force"),
--                          QStringLiteral("--datadir=%1/").arg(dataDir) });
-+                          QStringLiteral("--datadir=%1/").arg(dataDir),
-+                          QStringLiteral("--basedir=/usr") });
- }
- 
- /**
-@@ -512,7 +514,8 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
-     return 0 == execute(mMysqldPath,
-                         { QStringLiteral("--defaults-file=%1").arg(confFile),
-                           QStringLiteral("--initialize"),
--                          QStringLiteral("--datadir=%1/").arg(dataDir) });
-+                          QStringLiteral("--datadir=%1/").arg(dataDir),
-+                          QStringLiteral("--basedir=/usr") });
- }
- 
- bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
-@@ -520,5 +523,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
-     // Don't use --force, it has been removed in MySQL 5.7.5
-     return 0 == execute(mMysqlInstallDbPath,
-                         {  QStringLiteral("--defaults-file=%1").arg(confFile),
--                           QStringLiteral("--datadir=%1/").arg(dataDir) });
-+                           QStringLiteral("--datadir=%1/").arg(dataDir),
-+                           QStringLiteral("--basedir=/usr") });
- }
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 7180db4a3360..d9d6d12b2fd0 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,3 +1,2 @@
 DIST akonadiconsole-16.12.0.tar.xz 177268 SHA256 265a358d522c467da811153a6eba734d30c1519b7e8dca14d4d9f3896de9790c SHA512 77ce84d74a3a067518b33b6c9474772fe65b7c3bea6ac9157dbaf84e68eab460f34693838d45b9e0efe394eadc1530387f039aefc6c513e51466f4a8545727e7 WHIRLPOOL a6a08c1bc45260fb198ccdce9f6c65e8de46a999742e3608806f48981a162b7815dd1d1d3177ab28826f77aeb3b9a18c0791b798f1e6f576b548539a93073c82
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.08.3.ebuild
deleted file mode 100644
index ab975fdce36f..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-16.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 77a85eb16bdb..ab4cb8ac6eea 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,4 +1,3 @@
 DIST akregator-16.12.0.tar.xz 885556 SHA256 d46ef74fa6badb9db97478fae5868a37a1d676adb20dd9e60b4d71c001d17445 SHA512 73ee07421c71ac3701ae247373caf80b40ede4fd7bb197c6e39e8fa80a4f9c9ca1289e53592eff8771351bf3047c4d5702276543d1453a59ffae5c91433e71a9 WHIRLPOOL f487fe6cfdac02e56d1516481c6cc60918012acb988a853afb63507bb94812fc66b4bc84ca58dabbde8e00b92109fd3270f1c7b138e084e1454836273049158e
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/akregator/akregator-16.08.3.ebuild b/kde-apps/akregator/akregator-16.08.3.ebuild
deleted file mode 100644
index 51e9d44ed0bf..000000000000
--- a/kde-apps/akregator/akregator-16.08.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-# drop qtwebengine subslot operator when QT_MINIMAL >= 5.7.0
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine '' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# akregator subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
index de40f26606c4..184d5b43a71b 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,4 +1,3 @@
 DIST blogilo-16.12.0.tar.xz 331224 SHA256 1ebf7e02a81454848d0ff2e083f013761affaef76ad58f3f128c6f6ebf6b0215 SHA512 b4150c43bfa8664ff243fdf7d5e5ecd7679640efaa6027973beef386d1dca0d77ca32107b82293db084a05711c8803572696b0f0251baa983eb4a908fe345898 WHIRLPOOL 8dc65573a30d3efa7ff1bdcba0ba1556da67e929e9a105fd9ad78a5c24c9ae76a2a2b0441a993ac4b72990e1ad777010bd7c4cc28414027025638f2074a06461
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/blogilo/blogilo-16.08.3.ebuild b/kde-apps/blogilo/blogilo-16.08.3.ebuild
deleted file mode 100644
index c56b59ed2014..000000000000
--- a/kde-apps/blogilo/blogilo-16.08.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Application to create, edit and update blog content"
-HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="google"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	google? ( net-libs/libkgapi:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-apps-libs-16.04.50
-"
-
-src_prepare() {
-	# blogilo subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KF5GAPI)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/bomber/bomber-16.08.3.ebuild b/kde-apps/bomber/bomber-16.08.3.ebuild
index e549897c13d5..723cc813c80a 100644
--- a/kde-apps/bomber/bomber-16.08.3.ebuild
+++ b/kde-apps/bomber/bomber-16.08.3.ebuild
@@ -25,4 +25,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/bomber/bomber-16.12.0.ebuild b/kde-apps/bomber/bomber-16.12.0.ebuild
index e549897c13d5..723cc813c80a 100644
--- a/kde-apps/bomber/bomber-16.12.0.ebuild
+++ b/kde-apps/bomber/bomber-16.12.0.ebuild
@@ -25,4 +25,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index fe88966cbaa5..9d50c52b4e43 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-calendar-tools-16.12.0.tar.xz 61968 SHA256 4d45621265d4985bf6473203665c9fff75b84445dac17461914bc72b9c848c73 SHA512 6aeb99c14e7ea77890fdaf4fc27f0cb32057b0b9ab2e11ca481be9fc67d3d26d94b3fc7594d2079b2f81b31bb13e63d752282353f4c29463f5ceb9d5d7346926 WHIRLPOOL 5460cb0df4991135b686a34caf8dccaf591cda5f9769af661635171b512f574b716556ed5acb9e0a691e9c5a0ae6ea8d7b233906312803b453e5c53e20fdc61b
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
diff --git a/kde-apps/calendarjanitor/calendarjanitor-16.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-16.08.3.ebuild
deleted file mode 100644
index 05331597b084..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-16.08.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/console"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/console"
-fi
-
-src_prepare() {
-	cmake_comment_add_subdirectory konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-	kde5_src_prepare
-}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index db2de3f1d594..c1496d2ef28f 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1 @@
-DIST calendarsupport-16.08.3.tar.xz 100464 SHA256 4d21b5b55bb02b79d1bb857b150054f5c054a9cc89cdcd5e72f3a9dcbc0e1be5 SHA512 3713205a248f09dd423985a8a85d85766a69128924dbf41ac4562f4f19c82a5185886695480a17c710191163ae00af699234160285cf5aac6024f6d0d2913615 WHIRLPOOL 6b938667647bd9ad677e0dc57089771fb7081d8069f61170ba41c8b4e21b6379b1120fd9b91a543f53f469adf6de810d4601af254312332d2cd5a7c4f536d670
 DIST calendarsupport-16.12.0.tar.xz 100444 SHA256 dbc454d146ae418bb8abeb2d231baa89b2c3dbdde4f9eb629f8e7885e83e5f86 SHA512 7c61f9301c1f8bedf7ad86f89a56bbb895ee8ef35e691ee11e174e98c6d25a6ad781f3238dfaaaa695d82f5aef91cd89f2026b5c757c79cf6b23264bb9f8f7c1 WHIRLPOOL 2d7523760a56c97e9f4a8494931fb01860126b28d4d81a13868b1252ddf3d8a43582a39b2655cbee3d6d800b90f5121fd4cd29b96c8bc52b7b45ec91a5d77a72
diff --git a/kde-apps/calendarsupport/calendarsupport-16.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-16.08.3.ebuild
deleted file mode 100644
index d045b9599e7f..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-16.08.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 86eb934416b5..af898ec9419b 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1 @@
-DIST eventviews-16.08.3.tar.xz 147372 SHA256 622555f582467170c6e878fecf06ffc4db16c1702aad9e03da670581aaaf52e3 SHA512 a6bbdb94c057488edb50096d6363543aaab06e0ede857b3765e3c83e2cbb9a5d39bec1c880bc113bd6791c52299e77ad7307567842009225d6b46f791c07962e WHIRLPOOL bec7105d56535cd6cbe381048bf5509164548c6a6b54ca69a229e825ab69823df2f03e84f7a907cabdd42eb4efc129cc0df699cf928c5d840f58f75e8ba963f0
 DIST eventviews-16.12.0.tar.xz 147292 SHA256 4e130a62a72ba6a128cf74fc083116f745ff63f6dfc0705ded88683e727d1a11 SHA512 7bf8b2e03c8d34065925f54818d647de9998c3cc885217d4102b8b12c25bbc7b27ef88d12dbe04430aa7c14c8d7ecb376c9e690dfcc140fed5441b3888640c87 WHIRLPOOL 1d771e93e94e6f38d61d38619b38350c0e1cfab093db2bec5064c48314b5dad2f6b5a05559287d8a7fce74bf4a3e6c484eab3baf23254b8e39452c91421bd557
diff --git a/kde-apps/eventviews/eventviews-16.08.3.ebuild b/kde-apps/eventviews/eventviews-16.08.3.ebuild
deleted file mode 100644
index 1ed985d42098..000000000000
--- a/kde-apps/eventviews/eventviews-16.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdgantt2)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 30f544b5f0c0..577674f10c1a 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1 @@
 DIST grantlee-editor-16.12.0.tar.xz 45416 SHA256 c72ed76988a103fd51146db5fac6c231e77a3a36dffb27d2a978a598fddb2e11 SHA512 09e58101185577b2d91af1069e64d3addce2f77fe0152156d78406b0dff17943d2cd28b1c7ecb7a584c7debb4fd58a56b5f8858abf8f26f42b131ba7f468af34 WHIRLPOOL b60285b56a68436f98d42f607ab09afba22d9047a984334e4a4339efb1f7ec1a99a7e3c9c5b315213dff2e76608d30dcb546d2d094c11115a3cdb6362eab14d3
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-16.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-16.08.3.ebuild
deleted file mode 100644
index 79a25f611b08..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-16.08.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-MY_PN="grantleeeditor"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kmail:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
-
-src_prepare() {
-	# grantleeeditor subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-
-	mkdir doc || die "Failed to create doc dir"
-	mv ../doc/contactthemeeditor doc || die "Failed to move handbook"
-	mv ../doc/headerthemeeditor doc || die "Failed to move handbook"
-	cat <<-EOF > doc/CMakeLists.txt
-add_subdirectory(contactthemeeditor)
-add_subdirectory(headerthemeeditor)
-EOF
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index af46c27e882a..e7827ecb2f43 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1 @@
-DIST grantleetheme-16.08.3.tar.xz 42920 SHA256 f1b0cceb4eba154f068364dd08447e315cad180eebb3b4918cbd810a15fa59e8 SHA512 bcad59a07d792de04f2225ba4c94d62790b5818d8eff8078541700d278e8a822d2a7d9a7bae631985f82db4e6dc88b6a4b795aafd0169bc0b7c9f4e4ee584961 WHIRLPOOL 0a755317a547474e35b204986625f21ea74899eab920cd6b9b6d2ef760f5461052c7d08f7c3be75acb390dd719c81fbe90e009fc9cc554ad9c03aa82d25e2c22
 DIST grantleetheme-16.12.0.tar.xz 44028 SHA256 8b3cf4235295c4fb54e1a1bac9ea09e9741412474077f463013fc1fd5bdc221e SHA512 b97c3be4e23898f7aa44b7472633f255c5777e722f2a4768de3c1d73d8506de8809219da24196d4728f800fe66d288a8aace9d9aafade6e5914547353998d6fc WHIRLPOOL 4087ac512f7ba077339b5301a2b959d0a480a1f638f288c970ea58523dcc8e46509edc2da3f06a26143715093ac414123f612abddcd0ef08da689513ed4c5d4f
diff --git a/kde-apps/grantleetheme/grantleetheme-16.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-16.08.3.ebuild
deleted file mode 100644
index a36bb3cd9c8b..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-16.08.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtnetwork)
-"
-
-# fails if package not already installed
-RESTRICT="test"
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 4673b708271a..ed6c07d16606 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1 @@
-DIST incidenceeditor-16.08.3.tar.xz 121156 SHA256 b2575212b523b631ab24367f1c7fdf8f191ee5e610d3fbc8498b4b59fb946e0e SHA512 3d687e58d1b5f12a0364a6859973514543b20dd7bdb5d91d8442fff434f101c9dd9efab3016a50e369fdc10b6c643d1ccf2fe8ff93d22af3815eec87cb9ae02c WHIRLPOOL 1afe4d297714101dca282e898ed9f06f0b12cddf41828e7f838fa8bdeee060bb26e395afff2864ddf4bc8aefa01266cc94f4a4422a629490f114bb3d7e703133
 DIST incidenceeditor-16.12.0.tar.xz 121152 SHA256 096ff8f7d99b5c23f9a5d260735811df4a2848d06cc8963bbb5137214fef93fa SHA512 dfa816ce6881af5f820219ebb4d73810841d8260f20db26343f01bb817e6c55c59bfc4ec4da99fa05cac792965b4118339ce9b308bc5d1069718fe2c7d7458ac WHIRLPOOL d1081617c109bc8db81d13f543efab323de989da3be98177e32d2830173abe9061a6aaee14274b6282c032d2aa3ecc156a1c7a2d2c458fe8cbc7e2e06c5797da
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-16.08.3.ebuild
deleted file mode 100644
index 904c22167719..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-16.08.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdgantt2)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 97cd26c80ad7..c98e0f30941f 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,4 +1,3 @@
 DIST kaddressbook-16.12.0.tar.xz 164912 SHA256 670ece2aeab716d92da5b971b2df3edbcd0da49b963f8ebaf6d24ace82cb1686 SHA512 adb0ff8d9b8a79ccde38825ea880c6028cb018a0c5db43ab5426eec2b4ae66e8d9f5df92f1101613101f6056b8400c07a23ec29a025b2c4c65a9e1f878ac5682 WHIRLPOOL ed17326eb867baab7e9ee73c640ff5b461014d4430da70924deb93d12c44f24aab6b3dc7226fe10b91c79a7c5f92a1382db9774952e1cbaa563dbf9a08c9ecc9
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild
deleted file mode 100644
index fe9b07e0060b..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-16.08.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="prison"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-	prison? ( $(add_frameworks_dep prison) )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index daa861e3c5be..e79710baa53c 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,4 +1,3 @@
 DIST kalarm-16.12.0.tar.xz 565968 SHA256 75ae5647216b7199ca73f261c5a254fd905cff92a27b3bade95f93825ac179cd SHA512 e33e5a37205e027190ef69755c8a8adf39e188573ecdc424cdf6d0f129891837458e07321ceaae79b09577dacf34782b0d00968b0af9641167dd143ec27b581f WHIRLPOOL 1421050b13935fb4be3b9cf9635a852a5dc747d33dd8c2b45b1f4e0fa11d3dea7f648fbf263eabf3ab5ba6c4d6306d4b5fec84ecd18175d7e7843bf87d4966f8
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kalarm/kalarm-16.08.3.ebuild b/kde-apps/kalarm/kalarm-16.08.3.ebuild
deleted file mode 100644
index 615c14771e2b..000000000000
--- a/kde-apps/kalarm/kalarm-16.08.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	media-libs/phonon[qt5]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-"
-
-src_prepare() {
-	# kalarm subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 7d75324d12ff..975bd2bebe8d 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,2 +1 @@
-DIST kalarmcal-16.08.3.tar.xz 87180 SHA256 28b05259960c3c44dbdbb50d35b9e704c327946d63b41e7556430dcd35cd5919 SHA512 1a12b477a5d42508c88ca95df49c7345e1d74d52b85d0de5fa3dc35078db5088328298b99d2980a732b2adcb9a4cf54a7f788c16f1471589a40a6cfb6b560010 WHIRLPOOL cc3eea72e731bb0f85c8078dd2c22157cbe010f4e14a90cfb90248edd1635f7977560356aa6eddfc6b71db8d73da73cfb36276f75138abdd534aaf3e817f0fb4
 DIST kalarmcal-16.12.0.tar.xz 87572 SHA256 17489d945c60b2eb2403315456778f11d9568f64302a99be95ae4b8f7998189b SHA512 1e04f3c2f90fdb7d8f1cadfa341bc4e430c80ff9a5701998b739ef8165c80c5a21f79b59d94cf25f2645d4a886954d5675bb51b6f3b2fac8bca0e7c2d62eeaf5 WHIRLPOOL 395d1c86c52d7e47b30c2dd079d0becff964b012bd2eed90e3f9275abc994391e2f49b72008dd7a7244c178101ff812250b6612b39e252c3b80171bb828ba590
diff --git a/kde-apps/kalarmcal/kalarmcal-16.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-16.08.3.ebuild
deleted file mode 100644
index a21ccf993bef..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-16.08.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index f1f4dcddacf4..e2e4c82df44d 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,2 +1 @@
-DIST kblog-16.08.3.tar.xz 44004 SHA256 116b71b5b4499f9ab5ff1a030d7e2d5d72549569b2f3b29a5959f41c7b12b0a6 SHA512 4f3c4afc90e3b4b554f9448ca50db337823fca78550aa526fff6eeb1d94ac8993f449babf4ffd5885561a186e2b34eee633703bdb66ad59c8c1dab5a7d1c3c48 WHIRLPOOL d4647cc22ca9ffaa717ba992c282b168178f0b9371d7153d36cec0b2e6f5901a3fc3cd0f338e98cb74aa3260bed12ff97eef6a0623f34bcd20f69bf3b6e0a729
 DIST kblog-16.12.0.tar.xz 43720 SHA256 826f3272b3e029d03db29a934ab1dcc48c06bce31d99a77d1d551026673708de SHA512 86b0e5c91cf8fb144806700c5ba56224a504ec61fb3f6f7c0ed10740167087aada43b88db400a8220e908089aa6205a50d7ac0437a8355515e7b3cd1da5b8326 WHIRLPOOL 694530a190dc81a6e954977e2da72209ae9be70a0c34139bedbf3d4afed569839ac61dd76468361433655578581a7549433b5288c6447467041e2bfafa37dca9
diff --git a/kde-apps/kblog/kblog-16.08.3.ebuild b/kde-apps/kblog/kblog-16.08.3.ebuild
deleted file mode 100644
index 76e5671b6c60..000000000000
--- a/kde-apps/kblog/kblog-16.08.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep syndication)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index f45feb42f4f6..8f5d36ffe0bd 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1 @@
-DIST kcalutils-16.08.3.tar.xz 95032 SHA256 bfdc2bee386190804e58a956c66d103a10f9609089110810999746183a34d8f3 SHA512 a68923069640801f1e2003e347bf89478cae8e7500119df2d9f9ef95b23bb49f6ab86d33ea0fd4c99334373fed9691185c8b038af1450712e351d2156acd2292 WHIRLPOOL 91b77d4560b066a0b68b57c0aca618e27d85f9c03f005daec60105c9c8b3c6ce3b5db39d2654c54bdfb460d98dd9b2128e40590bb97263ef21f73e8a7829cb36
 DIST kcalutils-16.12.0.tar.xz 94664 SHA256 331ed1333bde0e04da592a5f194e00a13dd431b2b24aa8808779c9f7135d1421 SHA512 83a913aa312461cf2d578ca37bd0290347282f828fe08bf0d6a058372e198f6a0e087d2b7576aefb4e0d72c98cf6c69431013693109f832acfa0835e8a4883b5 WHIRLPOOL 297d0dc73c485c11536b2073c1f6221230b4006009b6578daf1e7cbbaa9968e028e1ab9eb53285159112b9f2cd4591892736e1f9f45e31636112daa075d954d0
diff --git a/kde-apps/kcalutils/kcalutils-16.08.3.ebuild b/kde-apps/kcalutils/kcalutils-16.08.3.ebuild
deleted file mode 100644
index 5c7bb90aec7d..000000000000
--- a/kde-apps/kcalutils/kcalutils-16.08.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 92d25b55fece..5f38de642e6a 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,2 +1 @@
-DIST kcontacts-16.08.3.tar.xz 145220 SHA256 dc2c547ab2b6ad9ff3fef648b4c1a5cc619d77edec27d4a920791907eeb81106 SHA512 3e4f7032de83d37679eedebee3793d2bcf7da9ed02567c795a74e498c4524aba065393c37b80246003318108ca4fb2088df508a0702a0c5140f126be52dddd75 WHIRLPOOL 84e8ccda6274e307f377d56a69c995d2e2b58bcb688f386e9bd37e4b7df9e5989174630f3be79f83c1353c4c4a7d4e134acf9b373db136b394a086c8e92cc4a8
 DIST kcontacts-16.12.0.tar.xz 147860 SHA256 3cef222013638b4cf74d2758fbb3c9317d85c891b2bab490c02b3785d781bde3 SHA512 a69db828c9bbae02efa72ff27538b7edf54401592a0998fb32135092c88340368c71784508d6a8a9ef037381831968e940cc8384390334fbe363574b6bf757a8 WHIRLPOOL be46f74e2103de6c479501c4587728747a0bd475c54ec00cec69f69ea68e45c2b7ee23ce64e3cafbdbba7aabfb10f551caa25c31a72eccc0a84ce9a1b085cf07
diff --git a/kde-apps/kcontacts/kcontacts-16.08.3.ebuild b/kde-apps/kcontacts/kcontacts-16.08.3.ebuild
deleted file mode 100644
index 257365afd2a7..000000000000
--- a/kde-apps/kcontacts/kcontacts-16.08.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Fails test because access to /dev/dri/card0 is denied
-	sed -i \
-		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
-		autotests/CMakeLists.txt || die
-}
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.0.ebuild
index f6da8a6ebdb6..82c5a282ad2f 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.0.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.0.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Library to support mobipocket ebooks"
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 7fe4b63240cb..3c8baed61cf9 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1 @@
-DIST kdepim-addons-16.08.3.tar.xz 286844 SHA256 b49473605f6768e3a01919f6274bca2ab0cd235f161265db546d41e392f2b035 SHA512 2a87158762291c547c9d1d04dc210797df8534b7f2411dd67602fd4e089ff795e2c87dd0c6c3930af3dd6d820db379836cbcda7e9c0c96477024854712356bdd WHIRLPOOL 13e7870d4bdcd153ee6124615ab8de6b77886d7b10633539397d24d38280a7e6beb6ce67c239e68f1c33323a03b87a56feda50f0d6e8c46712518bf7488ac996
 DIST kdepim-addons-16.12.0.tar.xz 331504 SHA256 a8e0db44b72bc0e53bdee49431aa16850643eb2f601b255a2e1651553b1e06a8 SHA512 fad651f3bf9a2634e4a6bacbe3b9707ecaf3814e589e32877eddda47cf4974b71473445135180e047163424cf27ea526d4f3ce8333425869af7ccf0d5b4d0c53 WHIRLPOOL e46fc5105bb2793f740a225f5b1941936847366468e8497c634065fa3a6616300102c8f1171261bc1bb6dd38d0216449867724e762d46d5381556ef0edd56c30
diff --git a/kde-apps/kdepim-addons/kdepim-addons-16.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-16.08.3.ebuild
deleted file mode 100644
index b0026455a172..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-16.08.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="google"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	google? ( net-libs/libkgapi:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep gpgmepp)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package google KF5GAPI)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index a822f9072c3e..4a2c863678b2 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,2 +1 @@
-DIST kdepim-apps-libs-16.08.3.tar.xz 38188 SHA256 25e4b0fa082b3b4489aa82f2dd927e6a20b6ab28db0a21dcd82fff0bc6aeedf9 SHA512 464e3fd0546a571b8eea0596f28771568b17f59cce0fd53b7e2017ad026e5a12f2c5de8f91af6152e162017c49286673015896895cdb2c09b551a5fd9ca9d564 WHIRLPOOL 64ddb17afcfd1d232820184e5e7fcd439945cc7524b7439fa4f16add6935413011271563a108b6cb2f25823f6f94ad47978ff355db8a87189c6ead3f7f47dd4c
 DIST kdepim-apps-libs-16.12.0.tar.xz 48092 SHA256 716f465e4ec9deef3e933472bf8168c125f4ab11968ebe1a2a8cccaeb9ada2fe SHA512 bf17564729df5f5fe9e0ed26de82fa0d52b77fadb54ad06bd7a276f377f33b3f53f8f89da3a981bf36ce57d955f67e88bbadb75c67d3e1dabf9f28392fc0ee37 WHIRLPOOL 27119ee246bd4df9c1f20c83d855b64a8d6601e9f92e84d92f189930cd8b437d2804c548c6cd9101ecc9ac63f9f528ec12608a4745f4108dd50288d353469a2a
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild
deleted file mode 100644
index ef5927cd9709..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="prison"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-	prison? ( $(add_frameworks_dep prison) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.08.3.ebuild
deleted file mode 100644
index ed1d5fbdddb6..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
-
-RDEPEND="
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep blogilo)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kblog)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kdgantt2)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ktnef)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pim-storage-service-manager)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	nls? ( $(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL}) )
-"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index a0b7c940d0d7..b7f007e0faf6 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-runtime-16.08.3.tar.xz 738036 SHA256 86cd72d2861b245c153af95c8969ef9060f12afc2b7e61026d2552990313ede0 SHA512 723019a608998186c7b711853f45562eff7d2fb78aca2647605b0df0213eb42987962e65fd3fdd40bf9a851bd023e3f5467782ff40aa2ed779465b4537973e44 WHIRLPOOL 9394d09a2b578ff3f47f86f6114bec94be17de535ebb2f710ba536e706884790fe82c437c19dc8dc2d9a395577c2a1485305703e0004c477705ea0452e5259e1
 DIST kdepim-runtime-16.12.0.tar.xz 738096 SHA256 dad51db221b977f3708951bc74a6672ccdcb216382795b736af7fb420194756e SHA512 d580507ff1dbadb6cfbdc9f7f7f72105c61658f7807356a8a370fcc3b41fa4ad3441d55eb86738abc7390ff13479fa1f198dc39ec8343ff128cec9079e964694 WHIRLPOOL 446a28fb56f7e6bb70d25db85f5078b2c1c48adc343b534c1679aaaa292be415008fe7fa98fef5ea9c300aee3d28cdc01c333ca867afd78613e8ea981779756f
 DIST kdepim-runtime-4.14.11_pre20160211.tar.gz 1655057 SHA256 00d0c78d84850b1619c22550fd938c0e016d1765a04623bac25dafffc6105b49 SHA512 6aeb3b35dc84a1cacc18619af5f7ab65175a31fbfb9a1d11d30dc98c6dcd3f40ebd18a90d2d02421b6a38fdc4b4d77f9fa6853c523a60910e92367f25932c45e WHIRLPOOL c14c3f9b85b7b157a9f274f4c74c687ae0e85e8b3ea6aa0756c640ff8f5dbcb3311366e3ff6c490a29ed7697a7a51c75ca6de6cef8b3ebf28f7da640e7eb149e
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.08.3.ebuild
deleted file mode 100644
index 852813c4ceb5..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="google ssl"
-
-# TODO kolab, Qt5TextToSpeech
-
-CDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libical:=
-	google? ( >=net-libs/libkgapi-5.1.0:5 )
-	ssl? ( dev-libs/cyrus-sasl )
-"
-DEPEND="${CDEPEND}
-	$(add_frameworks_dep kross)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-kioslaves
-	$(add_frameworks_dep oxygen-icons)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KF5GAPI)
-		$(cmake-utils_use_find_package ssl Sasl2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index c595d9f225cb..94e882530ca4 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1 @@
-DIST kidentitymanagement-16.08.3.tar.xz 36824 SHA256 4e6f2357b4f5fdeeb5596a020f1de06014fea30df1c900547964d1ce2bf0616f SHA512 f8b12eeb94ca740a7303693212c8fc04a47fd9e3e1bc862ad328e31234a5a8e92f0ab300b0e2dcbe6ac3ccdc7247b668cd04c2e49feb8a0f9b6a3b09b71e8ebc WHIRLPOOL 9ebbd1fa6822bae85e7d114578fdfe269caf027f48a426209aa74ceba84ba74820a594004b988f344fb0c8db2b85d25cfc08626fb630ea01c07b8980ca8b36fe
 DIST kidentitymanagement-16.12.0.tar.xz 38280 SHA256 130111d4876b26317a4a3a62f6e7d6c958bc3dd9206b2bf4c94ce2139c4aa57c SHA512 f8f734e1129ec2839a1b11b37e0424d663bb5ebb7399880dd01c226c2a5fc8f104a03085f9e158f5789d45406f63efba496e2342cf410b01449d932442f7eca1 WHIRLPOOL 2b41fad04f3afe6eecdfb41eeb52db1ef60956b7469139c925e005c0c8ab85dafebcc70ed787cf6a83738ee0881fc8ea75d3e52d4324b76c0c8c791d7462b6c9
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-16.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-16.08.3.ebuild
deleted file mode 100644
index f2d44fb18c89..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-16.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for managing identitites"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index dc07e3e5fc56..5cec461ee0d0 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1 @@
-DIST kimap-16.08.3.tar.xz 91600 SHA256 dce2612e7dafee7d0826d7dc11fe65174fca3f87eea2d75ebb52a4cd101ed40e SHA512 25eced2702faa13d08e633ad342d191bf66ecf8ba9bd0507285de6c12ac18b4f7cb4f67cc87d050647555555fd15543d401d4688fcf534dbb201f9084ea1dd12 WHIRLPOOL 46b3e90da5fd86e13f5fca7e1d93caa6663feeb4783a15403694e49baec949069bafd96c97f0427504314131f7322c104e64be7d180ef8a0464ce18aaf01ce0c
 DIST kimap-16.12.0.tar.xz 92392 SHA256 363177bdf71ad4e374124a0e6275799508413b917af9f4fbfa950344ad8ba3ea SHA512 49d4593fe56b561d4ecbaade87ecf3e637ad6d156a64757fe57c0f2d876e7ee9fbe76548e1a8fd6106dbd56d507a200fd732f26525210c614502d5ee6a6c35e2 WHIRLPOOL c04484a5b28039cf6e0da3115975109c2d946b0cfd10201aefef139f9602288c3f1639740b8334511e4b96f0c4b36d14c816f226b5e2e763bc373d53d1845458
diff --git a/kde-apps/kimap/kimap-16.08.3.ebuild b/kde-apps/kimap/kimap-16.08.3.ebuild
deleted file mode 100644
index ba4763374c74..000000000000
--- a/kde-apps/kimap/kimap-16.08.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 71f40df34f18..e511806c4090 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,2 +1 @@
-DIST kldap-16.08.3.tar.xz 59908 SHA256 6f93e7405984d4d6d2921242690ab3b4783bc216ee0209fa54945cc07bfb8cc0 SHA512 ae9a8f38f2db50314cb57e9822753101dfa7ace0fc008b7359d1def997c4c8fe1a426f15f298fd57ddc3f12eb624a247919c61c31b1c14f59c3b7c930b560d75 WHIRLPOOL e65e046548991a72c3a7bd5b7841c924433a519c3bf0333fe2192acc9624b2dccbd7838135b3f1cfb05a0042d88078250cef147606faef9d8a26c125400d6020
 DIST kldap-16.12.0.tar.xz 59920 SHA256 b962345926e87eb90f4869caf2ac9dedc463786cbb3a0c29bee553960634e4f7 SHA512 ed087680c374fbcf71b1103fd787ce4585932aa1c0327ca07b848ce39914a88c5dcda4829465711757dbde3dbb175a29211dc5e924ae5b7588d212a48a016d6e WHIRLPOOL 5f5dd347358c8c996935527e21378c48eaff0c5419ca77bf187be306d396e5797a5d24e5001f89e80aaf2f846cb6a99d50290aaec8dabdc2542db3d1a55b86d7
diff --git a/kde-apps/kldap/kldap-16.08.3.ebuild b/kde-apps/kldap/kldap-16.08.3.ebuild
deleted file mode 100644
index 7b827d343214..000000000000
--- a/kde-apps/kldap/kldap-16.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kmbox)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-nds/openldap
-	ssl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-kioslaves
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ssl Sasl2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 35e22614c5b4..a8fb3a4bf42b 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
-DIST kleopatra-16.08.3.tar.xz 732044 SHA256 ad916bd50f252024eafa72141d8b3148d0842328c3bd8278b0a0686c98269959 SHA512 4bdc9c360acde04c09fcb8cfd91fb1f44f59c8888da51dfcfba8974e284b1e9eb85aa1bdbb17042796c46158cec5a9ea58fc9e04cb7b8ae5dbf6b1114b781e6c WHIRLPOOL 64ce4b7e8ae0ac22e8ad3ddf177e57dd806586a521d22b8d77f56bcd47023c8c2c4da8bd0598ffe2ad0a9ed370e37e213f64ba070e67439e13486fd868a826ed
 DIST kleopatra-16.12.0.tar.xz 710792 SHA256 5393319a4c3350c2ef391cb3c6fe0a7ea7f187e4a3fa92965b806ebec5cdac3c SHA512 9a714ad4a68d27fcfb2e40140811065df2c44ab5a50d842038f001836d17460facc87ad15c53a37de80f6fd4abab295208e4ed850024935841f8dcfd3013628b WHIRLPOOL 517e41866b0ba0640f4ba1710698a5ec0f12bd3edf9e2d3250902be7268f41f5093417db2ea224e62bca0266e033b43d5e15fa1bdd8345ad74cc83a1207449f5
diff --git a/kde-apps/kleopatra/kleopatra-16.08.3.ebuild b/kde-apps/kleopatra/kleopatra-16.08.3.ebuild
deleted file mode 100644
index ecbcbc766355..000000000000
--- a/kde-apps/kleopatra/kleopatra-16.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 602b7a70917d..78aaf5adc57f 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kmail-account-wizard-16.12.0.tar.xz 61612 SHA256 fa4b0526a06c06719e86aec6fc149ca00806331b165e8411bf20a484abea3194 SHA512 4954ca6839a4f454bf33a39f4bdb0d4ff818f19d069de241abc162cc262d7bf2c73c5c8c442f31ae6271c22dbe43a2d05590c52323e376c7bdc82915e4a31568 WHIRLPOOL 952fa32ad3282d51f70ab2168540f1ee8c92a6465d741a3639e80c15440203c4c0a17e7430629bc37e893c4108191c12b1ab3a01ee0e67f1b4a6b4b0714f3af9
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.3.ebuild
deleted file mode 100644
index 29e8f75c3ebf..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-MY_PN="accountwizard"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-runtime:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 8fc25706e7f1..e468a0539c7b 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kmail-16.12.0.tar.xz 1529472 SHA256 eee7aeda83b8e0750f74d531d76afec5a69f44562ed97d9c91cd4a31dd7bcd5b SHA512 73b5fbb03faca706e2c2a11ebd545b2658c93c0a8b34682df6131993c658722587fac4490553cc408a9c622577e075ee94e565881b6ec64c8249e7aeb18f6924 WHIRLPOOL f9855fe9d045a6098604955fa593a65580fa4cb6df4c76f1af553f02b1076982657d324f774f7fd27dc889e2b321de2c716ac81f6eb2b051f9e5a21412647871
diff --git a/kde-apps/kmail/kmail-16.08.3.ebuild b/kde-apps/kmail/kmail-16.08.3.ebuild
deleted file mode 100644
index e09e7f499429..000000000000
--- a/kde-apps/kmail/kmail-16.08.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-QT_MINIMAL="5.7.0"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/boost:=
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-src_prepare() {
-	# kmail subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-
-	mkdir doc || die "Failed to create doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-	mv ../doc/akonadi_archivemail_agent doc || die "Failed to move handbook"
-	mv ../doc/akonadi_followupreminder_agent doc || die "Failed to move handbook"
-	mv ../doc/akonadi_sendlater_agent doc || die "Failed to move handbook"
-	cat <<-EOF > doc/CMakeLists.txt
-add_subdirectory(${PN})
-add_subdirectory(akonadi_archivemail_agent)
-add_subdirectory(akonadi_followupreminder_agent)
-add_subdirectory(akonadi_sendlater_agent)
-EOF
-
-	kde5_src_prepare
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
-		echo
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
-		echo
-	fi
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 2cf6f23d3844..5000a01754d3 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,2 +1 @@
-DIST kmailtransport-16.08.3.tar.xz 90576 SHA256 6f2e73eb97b7084176a0d8b6e11126dbfa6477f5825cbb44454fd6933b01b123 SHA512 089a05df508bca999b4581c5f9496140563afc5ee50064871918164d2f74e679f9207f86a536eb21fd576aafbec63c2584dcd18f97b446116fd5b8e7e39e4da6 WHIRLPOOL 3a32e9aa9d13ec51da1cb4613daf06a38f22a02fb7b6be771067ca57c89ae4edd230aa9fc02028ecdf2d547563dd803ff79baadccdd7a4cc6d646c2b2676d3f8
 DIST kmailtransport-16.12.0.tar.xz 91240 SHA256 d640987bd28e9ee3ff79f8f49d64193638d0ad3604b6e6591c985134ff49a742 SHA512 d5b25aa40e9af3c6f65ccf2eafa6a9ae976a84412b56260f9d613301bbecebdbf4f3900e825f044348904e9b24df4d9c719d20a2accd3f23eb7a89e43c347df1 WHIRLPOOL b9f572acedcf2a63badd3b3331dd8126892a424cc1378492c32c69a6c60b0fd2d98e6673b8cda90b92ed3f663b46bdc7b6c8b0f420623595c5a434f1719f3d2f
diff --git a/kde-apps/kmailtransport/kmailtransport-16.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-16.08.3.ebuild
deleted file mode 100644
index d3c05c1737c1..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-16.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	ssl? ( dev-libs/cyrus-sasl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-kioslaves
-	!kde-apps/kdepimlibs:4
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ssl Sasl2)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 7568f8e952df..b25f8cb6c81e 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,2 +1 @@
-DIST kmbox-16.08.3.tar.xz 24480 SHA256 277c9bccf2decdb99fd7910d970d1c534b1fb3ccec4473a4c29848972bc15845 SHA512 eb03d3a1f631d8e21613b66dac78ba974017c0f4f4d0e2060764b07b324a1a25afc9de66410f2d1ee2281881a34de0c7da18cd3e84581223a8459b3602154cc1 WHIRLPOOL a0308c056f240437a56774c717a739094e95ad1b96a0d01cf634032caf190f220e6f64ba2e5c0bfb1f6908048a3662e8a2597d9fa1e125ebd91b731cb34200f1
 DIST kmbox-16.12.0.tar.xz 24408 SHA256 b2099c4456d56472c607b7b184a70510524c80acb006e38a4bbc65751d58b176 SHA512 7d488c00bad50c4e367e3ef540b4cab069b582077fc99adc8d4e5f28eb6069505b098afc3d4a898e481f9631b4eebd7888cdf4228cdf03cf744b5e3a21b63b4f WHIRLPOOL 6db64d9c893d75252293bb6c886bd17089395e831f5fbbf300ecd33b5011653e63ef27995ac35f85bd9dd8d71aff994f1c737c62f5310890b89ef605bac2edbd
diff --git a/kde-apps/kmbox/kmbox-16.08.3.ebuild b/kde-apps/kmbox/kmbox-16.08.3.ebuild
deleted file mode 100644
index 890dc5bb718b..000000000000
--- a/kde-apps/kmbox/kmbox-16.08.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="$(add_kdeapps_dep kmime)"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 9deed435cec6..2d7d6a609f0c 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,2 +1 @@
-DIST kmime-16.08.3.tar.xz 122496 SHA256 6b2ad5b9fef4f91852a65c755f9f4725c31073af3a51353e4c5c07eaaa763649 SHA512 19ac9290483b793d91faff4ad5b7479d0651430235d39d38fb1f544c2fc48b4ad2a46850babb14f7d3c27bc59d336ff284ea0e905e8f215638ff006a1a7330f1 WHIRLPOOL 81eff75e5aefda4634e628be04fd773e6fcc498642e9887a495cf39c0163180c53f1ad9b22061fe83848f129b052ea8c738b48202ef504e17fcedd9cfecc4d79
 DIST kmime-16.12.0.tar.xz 122588 SHA256 1aee9ff6da3d9f355d06edd1a83a50ae3f7b91d987873ef7360cc7a0ee7b6666 SHA512 7f252536aa079669d24a66285387f665977852e65d3db88b921a8606da92eed07bba9e35f60fdabd7b9d3ba285e6628cd68633557f988a3638ccb4ad6e5a1c1a WHIRLPOOL 7984c03647d0e771d5523453c86d2790c9038070aaffb8d7f67010a8d1fee71f60c5fe687232145ac7e6e359923b4407a0a023f6c4d8ef7dbb14af0213fab265
diff --git a/kde-apps/kmime/kmime-16.08.3.ebuild b/kde-apps/kmime/kmime-16.08.3.ebuild
deleted file mode 100644
index abf94db1e866..000000000000
--- a/kde-apps/kmime/kmime-16.08.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index d8c92e00f45e..903f4f9c6874 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST knotes-16.12.0.tar.xz 163252 SHA256 5d79378e0724c1a1417080563765984d1af20ebe2bdc4a4dcae19c5844035467 SHA512 c30a028a1453908a6d22f4a79185abea1f089481a3a3e9ea03ae72911e407d5f999ee5ed7c1d3f30982b80d63230d63f36e7da53ba409a480a8f7730aa401489 WHIRLPOOL 0347103c67b6117032816eba7fce75950dd85bbd6250bc5406479e2e7779e6ee4c9cadb32e4b1fd0130373b037fd3313e99b681d4d771df81e17a3a5c73db452
diff --git a/kde-apps/knotes/knotes-16.08.3.ebuild b/kde-apps/knotes/knotes-16.08.3.ebuild
deleted file mode 100644
index 8dbb14d6a9c5..000000000000
--- a/kde-apps/knotes/knotes-16.08.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://www.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim
-"
-
-src_prepare() {
-	# knotes subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-
-	mkdir doc || die "Failed to create doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-	mv ../doc/akonadi_notes_agent doc || die "Failed to move handbook"
-	cat <<-EOF > doc/CMakeLists.txt
-add_subdirectory(${PN})
-add_subdirectory(akonadi_notes_agent)
-EOF
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 3644c9529ed3..f44ee3be8e6a 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,4 +1,3 @@
 DIST akonadi-calendar-tools-16.12.0.tar.xz 61968 SHA256 4d45621265d4985bf6473203665c9fff75b84445dac17461914bc72b9c848c73 SHA512 6aeb99c14e7ea77890fdaf4fc27f0cb32057b0b9ab2e11ca481be9fc67d3d26d94b3fc7594d2079b2f81b31bb13e63d752282353f4c29463f5ceb9d5d7346926 WHIRLPOOL 5460cb0df4991135b686a34caf8dccaf591cda5f9769af661635171b512f574b716556ed5acb9e0a691e9c5a0ae6ea8d7b233906312803b453e5c53e20fdc61b
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/konsolekalendar/konsolekalendar-16.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-16.08.3.ebuild
deleted file mode 100644
index 2232daa06357..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-16.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="A command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-"
-RDEPEND="${DEPEND}"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/console"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/console"
-fi
-
-src_prepare() {
-	# konsolekalendar subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	cmake_comment_add_subdirectory calendarjanitor
-	kde5_src_prepare
-}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 448cf0660c53..a5315a8286f4 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kontact-16.12.0.tar.xz 823912 SHA256 1dca717e69371242fe9018d782931dfde50b21a5af9ce2a080c0785f5d3fa0fa SHA512 b9d1babecf452e09ed046efdeae955e932535155bb32c8477bfaf867548ed94b6f9b50a02dc232f13a0ac4d2a92d7ed04a5ac8e74858c83184f7c0ab26eba172 WHIRLPOOL df5f7d3849b49fa9fb5f1758efa3c3b0e7ef47feb834ed1005cf6cc6a49724d7264bfa2fd7b4dedf01f54dc8160ef455e0977b5f20cf076391e7b7661fa86797
diff --git a/kde-apps/kontact/kontact-16.08.3.ebuild b/kde-apps/kontact/kontact-16.08.3.ebuild
deleted file mode 100644
index a26c5c46621b..000000000000
--- a/kde-apps/kontact/kontact-16.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-"
-
-src_prepare() {
-	# kontact subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index d8c8d84d4c5a..d08359399e08 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,2 +1 @@
-DIST kontactinterface-16.08.3.tar.xz 25096 SHA256 689d193f7be5c35f07c552e4825a52a0798b8742d37b3ee2f3952ec37a2480cf SHA512 43a33242e65854cf52ff109ecb3e78b31c780118aa9a0e6e107759468ae6713641aa3d1ff2c65d391c171e338d71e98c2d194f75828421ce0cf4ffb164b6cba6 WHIRLPOOL fbef41aad812b269ececf44906c531353c25a95a0dcc056ccfdd2355638757e66f9c3febbbcfaf73745fb00d70ac874ce37c9ee9d42ee38aa7c8e9a161fd6f0f
 DIST kontactinterface-16.12.0.tar.xz 25024 SHA256 f10590f89bc69374f7c43eb0e2b0375409897111e0b6007fe25f271db04efc99 SHA512 f7b083bc3845a52b4749f87a8f0395506914c7ec06ea642a96886231d3218e51ebd473e17123d4d412ffc93a631b7b406d34386ebccbaa643abb76056999b59f WHIRLPOOL 24906a20360ae1cd07225731fedd6ce98f8cd9a4750989e898258903c8d0805d21d8e730f6b3da5df94eeed9354dd3cf22665b70cf6c296991f65f69edef19cd
diff --git a/kde-apps/kontactinterface/kontactinterface-16.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-16.08.3.ebuild
deleted file mode 100644
index aab126c772f3..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-16.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 115a71099860..5e7e499a623b 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,4 +1,3 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST korganizer-16.12.0.tar.xz 830768 SHA256 47e3c23e73c63a9c9832e7bde2960199f23fb14f38bc53da40fb1b23389dcff5 SHA512 a81ffe3df59b0d2a39c5084ac66cf1b58d2b2ad547e868463b93ff6c10f8226d86e4681e7ef899babda97c8b032d3263b4ee9c3c31955e3abb4276ec4c2b2c67 WHIRLPOOL a6892250d35494f2b3d797e067d5f9e36407cdb3ba0284a9e878f54f4dc407f5745c8bff431d267874f3b9a11d6ae631cb27a3e1b61719ec3df1ea34bbfe9878
diff --git a/kde-apps/korganizer/korganizer-16.08.3.ebuild b/kde-apps/korganizer/korganizer-16.08.3.ebuild
deleted file mode 100644
index fb8d47853cda..000000000000
--- a/kde-apps/korganizer/korganizer-16.08.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost:=
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-src_prepare() {
-	# korganizer subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 49545f94dbe7..2e10c5cfc065 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,2 +1 @@
-DIST kpimtextedit-16.08.3.tar.xz 78728 SHA256 6a4d8298a51fcbe2e2d717b941fc75df98dc4a10e2f3378c7dd1377ee2206e2e SHA512 b075e68f8522a6b5777a4447c5e9f9d7d5091161419d73f4172caefbf8d2d0f8b9c0b2851141375be23750d70436fe3ffa366bfb4966d8a6e2e2ffeb3e26bf91 WHIRLPOOL ec9cfbd26892f3e96c2c7de4f641a5062328786da746e587bf9af45a816703d867f2c605c9c098b1fc6774b1fb3ca17453f7fc02f67239c12c40f3ea7f12679d
 DIST kpimtextedit-16.12.0.tar.xz 79300 SHA256 b020624a039af54669717d05db8fdf03f7d22339e519ce96d98a803c288c43fa SHA512 0d5477367b6e31ebdf0ebcbf21182df005f015f43a76651506083443bb499ff65cfdbae93b06a812fe2dd0dfd19c8bfe260768e82c1f75e808f4a223063b0fec WHIRLPOOL 92673b5d496bbdd5904d6fb8116203c7cfb10a341911268c7cfc27b35e89b7daa137bbca07694106afed7addbddce2a7575bc72fcf948dddd08a89ab5ec228a8
diff --git a/kde-apps/kpimtextedit/kpimtextedit-16.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-16.08.3.ebuild
deleted file mode 100644
index 23279e7bb42c..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-16.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktnef/Manifest b/kde-apps/ktnef/Manifest
index 668702f1782a..d63f48e1338c 100644
--- a/kde-apps/ktnef/Manifest
+++ b/kde-apps/ktnef/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
diff --git a/kde-apps/ktnef/ktnef-16.08.3.ebuild b/kde-apps/ktnef/ktnef-16.08.3.ebuild
deleted file mode 100644
index a90f0d6f07ea..000000000000
--- a/kde-apps/ktnef/ktnef-16.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)"
-HOMEPAGE="https://www.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libktnef)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# ktnef subproject does not contain doc nor searches for DocTools
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-
-	mkdir doc || die "Failed to create doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-	cat <<-EOF > doc/CMakeLists.txt
-find_package(KF5DocTools)
-add_subdirectory(${PN})
-EOF
-	kde5_src_prepare
-}
diff --git a/kde-apps/kuser/Manifest b/kde-apps/kuser/Manifest
deleted file mode 100644
index f73a079bde62..000000000000
--- a/kde-apps/kuser/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kuser-16.04.3.tar.xz 135504 SHA256 080238aa5d2baf18bef3f5d2a23a861bec27952a2ad48dbc7f23457049298bf5 SHA512 c82593ebe22c8ca709710cebd915552c74aebb4bbd6a28b8967d49448a2b792f9613ded382479bc5fedca1ed67771935f9301d0f26b3e86cc94fdf68c2d91250 WHIRLPOOL 098f0cf881e17c769e84a0c82be53a27c9ba1e160f98c316c256dda895956c2ade3632cc9a4f9497ac011167455c5f40dc6b760f2ddbb2940eb37c431d995d7d
-DIST kuser-16.08.3.tar.xz 135488 SHA256 f8b2cda7a1051e359b2442d320111477f85740c61831e92a00d6432230a31c7a SHA512 c5786c8afcacedb0d4e0ed97afee640e846f98ed33c52d1efee38245a07d3759edd5dce521d2a5960d1bd0554c5179511262f2f9cd2c389b44313e12c8cbb159 WHIRLPOOL 9eaec6f6d1863b2f675606c98e837ea6ad2a9b0d8a145348adda01eb064da0f5ca9cf031f8550cd335b0bf62fb0b594b481552d5ffbc2d411b4bf4452a9c0f1d
diff --git a/kde-apps/kuser/kuser-16.04.3.ebuild b/kde-apps/kuser/kuser-16.04.3.ebuild
deleted file mode 100644
index 44123a465429..000000000000
--- a/kde-apps/kuser/kuser-16.04.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE application that helps you manage system users"
-HOMEPAGE="https://www.kde.org/applications/system/kuser/"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-"
-# notify is needed for dialogs
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep knotify)
-"
diff --git a/kde-apps/kuser/kuser-16.08.3.ebuild b/kde-apps/kuser/kuser-16.08.3.ebuild
deleted file mode 100644
index ded9c338fc28..000000000000
--- a/kde-apps/kuser/kuser-16.08.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE application that helps you manage system users"
-HOMEPAGE="https://www.kde.org/applications/system/kuser/"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-"
-# notify is needed for dialogs
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep knotify)
-"
diff --git a/kde-apps/kuser/metadata.xml b/kde-apps/kuser/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-apps/kuser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index a02446881d71..9bb94418f718 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,2 +1 @@
-DIST libgravatar-16.08.3.tar.xz 21352 SHA256 7c466752ee4bf4a6fe192202172ef9ff6beb3c8e2c8f83a2ae536c0d49bdf110 SHA512 df4612a8aa9af9778cc16af5883588596900af6ab2bfff1832c1543615ed737ad05a4658d573392852e7a19a08e18e4bc9025228b50c3c5cbaacc88918646b62 WHIRLPOOL 9345a7c4cd3f773ebe65e9c923cdc3234dab9b18edc6e6ccf0f515ec1d61bf8cfd183996f3a07c8d183b91bafa2c105ea46186b929f4605b5ca35480959ff5d6
 DIST libgravatar-16.12.0.tar.xz 21660 SHA256 4c237243759f7647ab06e3aa33c9db5af55e0ba05d0c30dc29cb983d85429f5b SHA512 739d630e692e7338ee8bcfd10ebcb7da110bbb75ff1a4c4d2aee7c1fd015660fd0b70369d8e8f56e4c3198bb92af61d955c950a98e562f24043a3556a9a66218 WHIRLPOOL 549ef2e61d45b103550d7a91bea158f9ec53355a57f0b92542ebf3796ac94a9df527e53b37a0ba5d3be1a768e5d6c5bd5d0dfef7d83774cb1a9aa08fc90983d7
diff --git a/kde-apps/libgravatar/libgravatar-16.08.3.ebuild b/kde-apps/libgravatar/libgravatar-16.08.3.ebuild
deleted file mode 100644
index a64112ec102b..000000000000
--- a/kde-apps/libgravatar/libgravatar-16.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for gravatar integration"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 73fd46675711..5190c9222a39 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
-DIST libkdepim-16.08.3.tar.xz 114240 SHA256 d9344fb54c4f640e915c76b512b06b173779b9d282cd4002dffed36636dca6c5 SHA512 432b91b93d8a2683b0aa339e15e40e443196375af8e77ef1fca40ae292378031df1e7c1656308dac42ad2390b352011ef811cc86a2b07b6e786d7f51ec3b17f4 WHIRLPOOL 14d21ecc548b466fb56fcc923db703a9f3dd81d9ede961c5faa4b7abd1b53db5385510ed94bae43bc23bcd826ec76edbf69228d4bd4e4d1fb103a074247432b2
 DIST libkdepim-16.12.0.tar.xz 114888 SHA256 b8e84d16841b23ae344238e8b507eefa6c774e8b02f78fb58f7ccd8990f90227 SHA512 8c8d974dfc1a9a5dcdbaa1d7299f5bf947da7cdad6b77ac5f5455e976e16eefe04fe284f5133a9989d1950d84cef2338a9f6b4cf2e1997387404808951f59565 WHIRLPOOL 2acc35500afd2305536e157794d398884a1d87a2c5c0d7fd9d17b9e7f8d066d8460ace5d5ab3b3147e9902f88ba66926cccfde1bed9d6f2e332c2bbeef9227c9
diff --git a/kde-apps/libkdepim/libkdepim-16.08.3.ebuild b/kde-apps/libkdepim/libkdepim-16.08.3.ebuild
deleted file mode 100644
index a93a67abab57..000000000000
--- a/kde-apps/libkdepim/libkdepim-16.08.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index ea2c342333b7..00499984e7d9 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
-DIST libkleo-16.08.3.tar.xz 144708 SHA256 84959577950f22666dc3dbb9c6e7619971c7e40f7b01de75c4e7d8fbeefe104a SHA512 2f9ead0e5cb435debad110a1f9ea4c8d0d00e0fa4e8bf54a27cbeb6ac4bba0d479a18cb29ec37b6311bc0662afd33a2e260cf7cdee136c68e23fdf4d8b0082fe WHIRLPOOL 36ef5dcd8a0f8b9c31903d59e2b77661693bf56ceb53fab459ffa1eea61c8bba7ff016ebd059d0e96473715d6f236b2b66653131ee82a1bd08996148bd2a371a
 DIST libkleo-16.12.0.tar.xz 130976 SHA256 986ef5d825894f58ac418b3069c55c9a8b638d313e6512871bc9a535fd22693c SHA512 04960ae48b4583f08de7714053e39a60c257b516dca4b573d58ee0b6df60d477590a9301d069bbbdcb5cf45ee37cc035f68f651232df336d7f31eb1e42f5de79 WHIRLPOOL da3c99a55458336d1c37ea395bf2ad2a6508e1133f8ae23583c27a2061678a8e61cc0e798a7e7d055fd96883c288d2ecb79c5b9e728c90bd92c985efa6d225da
diff --git a/kde-apps/libkleo/libkleo-16.08.3.ebuild b/kde-apps/libkleo/libkleo-16.08.3.ebuild
deleted file mode 100644
index a89ffa617df7..000000000000
--- a/kde-apps/libkleo/libkleo-16.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index e25b333609a6..f7cd493aeb3f 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,2 +1 @@
-DIST libksieve-16.08.3.tar.xz 167384 SHA256 8760082dfe27e5da0b774e48030a079fe60ec83c56e9bd40197b883441ea277a SHA512 f238708ff5a63c263bc4c66cefe7f1e999b1c0e7c3da0d6e3e08f0ebaa94c63b33db670c14a243fc9b5f18303f5bd7d7af521d10c83be8be375de8556428682c WHIRLPOOL 941ea1c42eebf7e2eabbe56fb908a79e4f2cfc6022c086c0219a4858006cfc1cc2e5b8eb209f17f8b5f6a74efbc927a945157279fabb6ff167c662cdf0a752cd
 DIST libksieve-16.12.0.tar.xz 169856 SHA256 21b23c6347fca5852d09202dca1521bb8a1af4689474b4f25d578cc517d29db9 SHA512 8fe0395e05129666524c45a2d491edb615fc22ebe3bacaf08484912c7c6519a92808fc991e45e21103bf15fac9b7b642c2ae96e72036db6eb37e20a33e930be1 WHIRLPOOL af8963c4c0857bbb071fc95a19795c5f5b3d1c9638cd6140d7218d1f6099f4a584987cc90e0b94cf02e269ffddcb75c9e38e586ce3b7e4803908836900cfc896
diff --git a/kde-apps/libksieve/libksieve-16.08.3.ebuild b/kde-apps/libksieve/libksieve-16.08.3.ebuild
deleted file mode 100644
index c21ef32c7ba3..000000000000
--- a/kde-apps/libksieve/libksieve-16.08.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-# drop qtwebengine subslot operator when QT_MINIMAL >= 5.7.0
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	ssl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-kioslaves
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use_if_iuse handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ssl Sasl2)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 1eb25a15a14e..fa28886e37c0 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1 @@
-DIST ktnef-16.08.3.tar.xz 232588 SHA256 78bcff2f0fef6827f1ed9690e99d670c06ad96348377be3b37cdf78782fd3f30 SHA512 8915d36283a00df7067244fbb3a8c89d8d5a5fee17c4beb96e886bdd62ab020bfc1ca6e81305e8c1c350833a8ba3c8853245666e50b3c0931cc0e6f2c07c8e4b WHIRLPOOL 8ac1eb93ad6d8474ce87168a0b5bd545ee23112441584f02f875b971bc727c7023a260193aea4b737e466d6345382cf3c0b5fbeaf8667bba194a990b523cddfa
 DIST ktnef-16.12.0.tar.xz 232556 SHA256 302360cd865396ba90444153387cafafdd4d0091270f44c79cc6b73c7c9d9638 SHA512 594700f04ad49df4b1de035130c2f2d423363034894e4328513fc5777b9aa1485a7d022daef46135150a6dd6e8b413ef2df71b66945a03e15394f9845bb74106 WHIRLPOOL 88c1b7063a6d1c914a0a6a28af11570d753fabbd8bc1235505b8408d9a380644d2758b5751bf4233760400138ddd3de651266d6e62998f20b13d08c2d3669f48
diff --git a/kde-apps/libktnef/libktnef-16.08.3.ebuild b/kde-apps/libktnef/libktnef-16.08.3.ebuild
deleted file mode 100644
index ec234fd62752..000000000000
--- a/kde-apps/libktnef/libktnef-16.08.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index e48f182ec278..c5332c7cad9e 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,2 +1 @@
-DIST mailcommon-16.08.3.tar.xz 188320 SHA256 3b2707b5f7c4fe593da7db59545dddd848868f66e2dbc4229239f3e3a9711c20 SHA512 937ee9dfde4d85394fd46882d95cf35126ffd1904e6dcb50a3efd0eaeccac649710dc008f922741e9a02165b1f2303330ab34881388f6bfea8b9859eb49695b5 WHIRLPOOL c7eb5cfa7f5f06c330451d846e7267ed1cc0689bef593874d6e689823f8db41351d8aa2407d2c6ebd8b150a18f283bca30e9ec2a06554c597d6a8e7d960aad77
 DIST mailcommon-16.12.0.tar.xz 189364 SHA256 de276e352c6fd18f3f44c276a1d706740eae671099ad254f49333836155a45a8 SHA512 e4c0909ebbf6e68347b4733c27c483eac0357edbb5318088467a3997f0ec274a7943c56a307d6192a7048feca72e8f4abcde335bdefa55bb3b58ac1b8afcdfc3 WHIRLPOOL 1f34aa128bc73052be364216531e9243736edf0a209e7639d79f91398277c815511cf092388449cd621d39535775fe02126f77a834f68d65a3ad1074207b8b20
diff --git a/kde-apps/mailcommon/mailcommon-16.08.3.ebuild b/kde-apps/mailcommon/mailcommon-16.08.3.ebuild
deleted file mode 100644
index 86b2df9c9e07..000000000000
--- a/kde-apps/mailcommon/mailcommon-16.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 679b5b35d1df..1716784b904b 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,2 +1 @@
-DIST mailimporter-16.08.3.tar.xz 382868 SHA256 68a90c143ccb6599f89f4a3244926523993cca10a0353087b7238aecd776978d SHA512 7031dd0dfeda00bce00ee394f435e2b74806cb6bafa00e37fb3f4b3b0a11cb0eecf07af2aef6ae420f3bd07d9d94c7a99857e924e756019b471220b70f56b659 WHIRLPOOL 560790d02f1a6e52544f428bfadfee1448f423ef9b0fbdab681aa420d68aa2799ebfeca12d4696943b64dd767bf184b20e079637b10cb7200706705d0242ee4f
 DIST mailimporter-16.12.0.tar.xz 382660 SHA256 f32137db5dbaf3752bb0fb9f4265e656bd5bfe0377586ae43cf37f0a09ad34fc SHA512 63646868b56f3c0d7562291b279473cc49bc801eebae87defdaed9fb510503c06b8e839cadd9a9df30a09512e2ded917ee28c19ddc98e4671b5e05cca19912b4 WHIRLPOOL a2dc3f77f77d08a1770b2519cf334cbf3cb5978afd430e8643a8515aaf98cc2cadedd650d30d37f6c3b97508f867aaf4931487aca134f97ef2f7e5daa14a60e7
diff --git a/kde-apps/mailimporter/mailimporter-16.08.3.ebuild b/kde-apps/mailimporter/mailimporter-16.08.3.ebuild
deleted file mode 100644
index 6b7cd91e8aa0..000000000000
--- a/kde-apps/mailimporter/mailimporter-16.08.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index d317664c2503..2d39e5bb392b 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST mbox-importer-16.12.0.tar.xz 22712 SHA256 22fbaaed91f9d4dc197b94617335c3326dc111a14fbce6a99ae8472b7528675e SHA512 32f8b77a6853ba7a7df7fb53840d7443ca2ccaee534dfc96baf38ff077f8b856107a03acc974f255f097b39261537161194a79af5f4ebb65353b1eb7b5cc2080 WHIRLPOOL 2d68ac250ea105a1a901545c15f5d817fd6e6b91faa9561e7ec04938591b676cef6a7860bdbc3cbeda1af4611a9b010708977cf8cbfc758f117666370b5ec6c1
diff --git a/kde-apps/mbox-importer/mbox-importer-16.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-16.08.3.ebuild
deleted file mode 100644
index 14cd2bd19616..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-16.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KMNAME="kdepim"
-MY_PN="mboximporter"
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kmail:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 06adc5ff82f5..42602ffbac90 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1 @@
-DIST messagelib-16.08.3.tar.xz 4622424 SHA256 0a431b273f400f1e4b20b2d9a147f649a2ac1cf2db2c5c3771afa942a0381387 SHA512 01add94990781a7ee486df395703ae6b360f8d5b0038999c4ec578b30b07b353a4b9d65c92beeeae7896aa3fbe820b5bec459879bccd22af6f385a0731375265 WHIRLPOOL b4096d015d95e099bcdbe83096d01363157a09f56b6ebd0084078f9c3d42fc19ecbb4af9fdc9936cef1a0dfa23da7615688196dd2e7f9632b41f830016f266d1
 DIST messagelib-16.12.0.tar.xz 4644432 SHA256 447afdabb213add13f6b665e8d9373150241eb96f890254eb092c37cc5ecc558 SHA512 2252516c6774d3f1db7d4e1edf7a566c979ed69a0a67a235e8ae5d3255618bf721f058405902f19733413112b57030c8ed818996f4d40aa776348fec344feb34 WHIRLPOOL 7d416986a46d69f49f44c9fb81c95df5a915030f0bfb944100dd49393b47ef455a27a2c5b78b4cd2cc9301e4f59d73e12e90d4acef683156e249f8e53d8c75eb
diff --git a/kde-apps/messagelib/messagelib-16.08.3.ebuild b/kde-apps/messagelib/messagelib-16.08.3.ebuild
deleted file mode 100644
index fa77c40f9f33..000000000000
--- a/kde-apps/messagelib/messagelib-16.08.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-QT_MINIMAL="5.7.0"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi-contacts) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-addons-16.04.50:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-# bug 579630
-RESTRICT="test"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index ef751e593ac3..84d87ffb2493 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST pim-data-exporter-16.12.0.tar.xz 103244 SHA256 a9a281a6df730839b039fe4bee50b5842505d0d5c60733720c892db2afce5674 SHA512 b67284f95f601216e7f5a24ddfb6999f6ff9a2faf64ac2dcf168cbc46bcaed3ae45715561da46e00d281f54fc0b841f310bfe956c7f0d03714b681d7560f5594 WHIRLPOOL ffdf0f370cc0acba7e3326152ea058d4b5bfa0a655274e8e9588eea3dfe0e161eaec1ca699001763ef2313ee19880eec5a9c9b4de34712c05369a947fc7419d1
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-16.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-16.08.3.ebuild
deleted file mode 100644
index 2fa33f88b2b6..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-16.08.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-MY_PN="pimsettingexporter"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kmail:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
-
-src_prepare() {
-	# pimsettingexporter subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${MY_PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 0cb30dca5b80..a532e0404132 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST pim-sieve-editor-16.12.0.tar.xz 316520 SHA256 b9fc3be7ceac2ab672587c305ec6286c872a4fcadada7869feca8b82b6724035 SHA512 926513988fe44432e10eb9d98908730f689fe41763e62a7def9b62c01ee33b69201b89fc867c5dcc748a0185fa248f3230830bd9f4021410eb589e3f11d0e04f WHIRLPOOL 3c62d2d0f900db32b4b7fe8a77cfe9c7fbbb3bd35bec0f5b699225845fa35a1887afadebc600aed5373a63e133fd1996a26cc3e5dd853945b9d6cb2295b414f2
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.3.ebuild
deleted file mode 100644
index a68b64a949d4..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-MY_PN="sieveeditor"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
-
-src_prepare() {
-	# sieveeditor subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${MY_PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/pim-storage-service-manager/Manifest b/kde-apps/pim-storage-service-manager/Manifest
index 637a1502aa45..c768539c4e15 100644
--- a/kde-apps/pim-storage-service-manager/Manifest
+++ b/kde-apps/pim-storage-service-manager/Manifest
@@ -1,2 +1 @@
-DIST kdepim-16.08.3.tar.xz 6334104 SHA256 ba4eeb412fb3b95e5b25650f7d1c6386806fd9c8eb633b58ca1fa63846dc19d0 SHA512 eb54fe35c959651449f0c256ad31a391bb4292c0ff461fcb945caf925ba52ae7a07747d4871768efb28c87e243e5f1a5bf2652d62f5d640a0b9ce9e550472a5d WHIRLPOOL 8d6bb1bf7a27734028a519ed4f39dc61121c456945c26a8edad038066f87a77d2535c4287e0a109c32b7652e15ec7ab27c512a77f90676d66c03ea7e1ae267e3
 DIST pim-storage-service-manager-16.12.0.tar.xz 36740 SHA256 c45c00c0e081bdd50549bfc6e0e8b09da88a7593a318fb84c6d5d920d2477fac SHA512 79f6573a59a93a4a3d68b114e1066e8ed4414c9880f3aaf3b614b14fd689b30ae3176a21b842ef5e9fb37d770f215637ea49b5bc1b508c5b5ed5cd6f38564eab WHIRLPOOL f02b00f64af9a7bacf4c4cc47b53c9a57d059aaf99f25305b0dc147206aca060f8ccd6e1c55837fed758f3da67c9b81a919e759c2266e8e0faa29eaf8ac337dc
diff --git a/kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.3.ebuild b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.3.ebuild
deleted file mode 100644
index d1ababde09c4..000000000000
--- a/kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-KMNAME="kdepim"
-MY_PN="storageservicemanager"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant to help with managing external and cloud data storage providers"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim:5
-	!kde-apps/kdepim-common-libs:4
-"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${MY_PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
-fi
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index ee87f7ec0e86..16c770750c96 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,2 +1 @@
-DIST pimcommon-16.08.3.tar.xz 154620 SHA256 3edf118cc5ebc7a28ef17283a7e4384fc74a62170163ad6aafffb03cc054681b SHA512 005c824db516541fd1011d88784d5c8e4e989aec8b67938a3e73f9d716fd189bb7b4eb8a2b0afb8792fb2518735637e3b614b9803573399f5eef0a3ebc48021b WHIRLPOOL fd0fe4cc1f6f3a7ea2f373466c55a2cd70518c7599ef41bf5e4c31b60eedcf80a0099bfff9af6303ad4a778648b7fe63067b6ada5d6c1667d5b4caee447c7c52
 DIST pimcommon-16.12.0.tar.xz 159568 SHA256 741860d266b8816ab0674f67047e102c1f0b38d57173dffb16023fc6c5133fb3 SHA512 897ba86b407249c3769faf0591673cd9dfceffe3733c5d95ceb7bf11ecebc8472cf13cd941d112c3da8512519b448cc5adcff58edd4a6f1cd64a9acbeb1094ce WHIRLPOOL 76f069dbb2d8d856e26eabea0bf7c56b029d7296c4e916f4b6111c2109fb5d86d5f8c8c2fb0d9f9954911725b44d0d6b723f2ea2d8d58fb2e3dc4524c7f9466d
diff --git a/kde-apps/pimcommon/pimcommon-16.08.3.ebuild b/kde-apps/pimcommon/pimcommon-16.08.3.ebuild
deleted file mode 100644
index bd7e605bb803..000000000000
--- a/kde-apps/pimcommon/pimcommon-16.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-"
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index e555884fdae2..d68d4417aeb0 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,2 +1 @@
-DIST syndication-16.08.3.tar.xz 160120 SHA256 6ee14a35d06ac77147afdb6aaa4185df69f3c4e11a1039fbfd01ae8ef8cf1037 SHA512 ddb0eca3d2df51a20225d418e76e7bb9a7c33a18c0e156d129987c0cfd7df7e8b1fba1d3ff0053d6ad2d3f736ad67a29d2c47960b2dc507c5ca8a0d15a39dac9 WHIRLPOOL 04625e444b67e6474bc0cbe9824bfb8082928cb9c45f0365bb53579db6ad5188b4d80314fc46b0b11307694356d1bceaa897f9276a507b5d354ee2c9dd12d273
 DIST syndication-16.12.0.tar.xz 160032 SHA256 7592932691948b241b17cedb353cfefb675526631bc65e7540e0b891e97415fc SHA512 eac814152a063bbce61b115c7e1c9ee1c6a0ec4243e1610339d271010c268b2570b8b5ec4c26f22adfa30ab24ab0f176ebffbba04094f9443e9ebd6e8bd589ad WHIRLPOOL 4d41c492600a4df7537f97982edafb9456c02ebda07a26f5e8f7c0a9ea9dd89deb88f75467a6504c302ad1784acf8aa53934e56d99504832a11e5decf88ba6e3
diff --git a/kde-apps/syndication/syndication-16.08.3.ebuild b/kde-apps/syndication/syndication-16.08.3.ebuild
deleted file mode 100644
index b81b4be5c576..000000000000
--- a/kde-apps/syndication/syndication-16.08.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 16384f0a8736..d69eb2eb4fd7 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,2 +1,2 @@
 DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894 WHIRLPOOL 2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2
-DIST kdelibs-4.14.26.tar.xz 11634296 SHA256 391d37eceb30d4fbdb4be1acb202a42aa8a202ef10ea6b67904383118bd26a10 SHA512 d9abfb98c0e50ea85892429522febc9fdaa51070ab62eb4b01781b543dfc446d508ff0360be2bce68d0f5e446100b2aa3bc2253a323f16fcfb3a26362fd65d0b WHIRLPOOL 2ddd1efc3eb660c19a18d3acdbc646a251c15a662b9f23c675623633d860b44f4a2d2d6138aa9568b641e1d94af304805b4db609eac77c855fd3df09f6d5171a
+DIST kdelibs-4.14.27.tar.xz 11641732 SHA256 b79fe7f8798fe6a3aade6eced396b40b5fbb638200604056a18b377ee76ecfb2 SHA512 52a76c6e5cb8366bf353a1eee8286f4165fcdf962ac0da5545a96e066bb513a9eedbbacd7ee6981d9034e08a84f795c68d26fa2f02774938ac1a4971a8a18427 WHIRLPOOL 4cfa7a6f9c7dd74c9e90e90c9950babd1cb966655b77093fbe6fc2a7172998c720c9b9fe29ac9f22e18f1577475668fa96c9b6142051a19ca20cb57324cc0692
diff --git a/kde-base/kdelibs/kdelibs-4.14.26.ebuild b/kde-base/kdelibs/kdelibs-4.14.27.ebuild
similarity index 99%
rename from kde-base/kdelibs/kdelibs-4.14.26.ebuild
rename to kde-base/kdelibs/kdelibs-4.14.27.ebuild
index 23d57643e66d..5060449840bd 100644
--- a/kde-base/kdelibs/kdelibs-4.14.26.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.27.ebuild
@@ -12,7 +12,7 @@ OPENGL_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
-APPS_VERSION="16.08.3" # Don't forget to bump this
+APPS_VERSION="16.12.0" # Don't forget to bump this
 
 DESCRIPTION="KDE libraries needed by all KDE programs"
 [[ ${KDE_BUILD_TYPE} != live ]] && \
diff --git a/licenses/CLX b/licenses/CLX
deleted file mode 100644
index a0847ff40fca..000000000000
--- a/licenses/CLX
+++ /dev/null
@@ -1,17 +0,0 @@
-    		 TEXAS INSTRUMENTS INCORPORATED
-    			  P.O. BOX 2909
-    		       AUSTIN, TEXAS 78769
-
-Portions Copyright (C) 1987 Texas Instruments Incorporated.
-Portions Copyright (C) 1988, 1989 Franz Inc, Berkeley, Ca.
-
-Permission is granted to any individual or institution to use,
-copy, modify, and distribute this software, provided that this
-complete copyright and permission notice is maintained, intact, in
-all copies and supporting documentation.
-
-Texas Instruments Incorporated provides this software "as is"
-without express or implied warranty.
-
-Franz Incorporated provides this software "as is" without express
-or implied warranty.
diff --git a/mail-client/trojita/files/trojita-0.7-gpgme.patch b/mail-client/trojita/files/trojita-0.7-gpgme.patch
new file mode 100644
index 000000000000..2a7a6d5e7085
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpgme.patch
@@ -0,0 +1,34 @@
+commit 1978d0a12d2cb4886c5612d6a50b145f409d815c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Wed Oct 26 22:42:47 2016 +0200
+
+    Switch from KF5Gpgmepp to Gpgmepp
+    
+    Gpgmepp is part of GpgME since 1.7.0.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edf3e79..6993d2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin"
+ trojita_find_package(Git "" "" "" "")
+ 
+ trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html" "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC)
+-trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git" "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
++trojita_find_package(QGpgme 1.8.0 "http://www.gnupg.org" "Qt5/C++ bindings for GpgME" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
+ trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP")
+ 
+ if(WIN32)
+@@ -615,11 +615,7 @@ if(WITH_MIMETIC)
+ endif()
+ if(WITH_CRYPTO_MESSAGES)
+   if(WITH_GPGMEPP)
+-    if (WIN32)
+-      target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme)
+-    else()
+-      target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme)
+-    endif()
++    target_link_libraries(Cryptography QGpgme)
+   endif()
+ endif()
+ 
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
new file mode 100644
index 000000000000..308c9fd73e27
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt +dbus debug +password test +zlib"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	crypt? (
+		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+		dev-libs/mimetic
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	password? ( dev-libs/qtkeychain[qt5] )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+	zlib? ( virtual/pkgconfig )
+"
+
+DOCS=( README LICENSE )
+
+PATCHES=( "${FILESDIR}/${P}-gpgme.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
+		-DWITH_GPGMEPP=$(usex crypt)
+		-DWITH_MIMETIC=$(usex crypt)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_QTKEYCHAINPLUGIN=$(usex password)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 6bafd01db3c4..3f40f0828e6d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,5 @@
 DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
 DIST darktable-2.0.6.tar.xz 3018300 SHA256 2368c1865221032061645342ba8c00bcd6d224e9829a55bc610e6cb67de738c1 SHA512 6ed9fe1d031bff7d27051111997b5da1cbebaef35ebfff42a3f0e2c8ca9ac6c46fc271d13468df7b2dd887553e06454ca24030d226a725f04f5b0b4635e62355 WHIRLPOOL d58dea18a3a75e16d8895b668a375d179ce6250cafeb399e89bb7f4baeeee25b8de2151d5eeed14030a8e154855b8d3d1e9789f33b9169b7905641858385cc4f
 DIST darktable-2.0.7.tar.xz 2960436 SHA256 a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab SHA512 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928 WHIRLPOOL 2d8df1d69c367df83d7933c2b4d6a904b4a56c5f13ca67820263669067ee938dbddb514129827abeec02fd01b82a23512d57e95461f6a44e5327516205dae3c4
-DIST darktable-2.2.0.rc2.tar.xz 3265220 SHA256 f3ed739f79858a1ce2b3746bbab11994f5fb38db6e96941d84ba475beab890a6 SHA512 359207ba75d5ddccd3e0d4f397c1b3374ef5f5be63fc0ea6a1c63f916fbffdb384e4c665bbb085d5b4fae644519c7a1c85d37290f6774113011aa21459918f5a WHIRLPOOL accadeddb32ab61a9952d0e72b7de9c3bd15c7bd569fbc417c03b2e6d92b098bf81516e991bb3201c77d55043f7ad5d1bd8d4836885872d9cead65e5ded70a43
+DIST darktable-2.2.0.rc3.tar.xz 3262016 SHA256 f7b9e8f5f56b2a52a4fa51e085b8aefe016ab08daf7b4a6ebf3af3464b1d2c29 SHA512 8565c142e8d44dd7627c94b556a6a491269ae26f3a239e4c24372e3d8e149a9ad95099fb5ac1f7bfd331102094db6ea0f5db8a96463ccf8a2749d502dfdfc6fb WHIRLPOOL e1be197c01ae80fa6046bf32607c95a804f91f9cd2c3c94cc0093958c61920ff5a2f03d89d13e6bad23adbc3bc252bdad77730b9a5b24c9a665849dd753a9e40
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
diff --git a/media-gfx/darktable/darktable-2.2.0_rc2.ebuild b/media-gfx/darktable/darktable-2.2.0_rc3.ebuild
similarity index 100%
rename from media-gfx/darktable/darktable-2.2.0_rc2.ebuild
rename to media-gfx/darktable/darktable-2.2.0_rc3.ebuild
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index dc71f7e63b7d..815e3e92ff47 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-3.0.1.tar.gz 206137161 SHA256 3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 SHA512 4d3446b90f7d5e9049ce77e9ac0dff2868dfe8ee1c707eec5d4c9d8e2168867447499079bae63ba45cc4f887ff00f0c91221e9a95c2185c0b023a1be02f09305 WHIRLPOOL 4e7165fa508616f2c36bd22b5a1a4d5c8147a0340ad6dcf1b183a85306aa9d052eea4bf7e068d1e358a1272baaa16ca316fac8fbc1515c1c1bcfae72138c8951
-DIST krita-3.0.tgz 193020370 SHA256 4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a SHA512 a32507b010b5b785a40d830beb49272155d502c4c27ba874f1c9e75cbf49c7f1f730b3ecef06f24fc1ee9d3e9505c940bc20cb275f97c65e090cc5a59529486b WHIRLPOOL fe3b7b308aa754b597375aad49ef5f07d4e0e346f0109aec3b731d6dc1aea320380b01a2166a305c8cc578cad44cc19a1b4ba7fdabf9f7a841e3d5e0bae3e7fa
+DIST krita-3.1.1.tar.gz 209529508 SHA256 62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f SHA512 7de24ee9fe36fd832d8c98b14a585ce7c56b4444ab7acd34001cb99009d02059de9e4c0aaf690cd9e48aa5a3db32e94a820e80c78dbeaf22495bf1bd1a8da9f1 WHIRLPOOL 15b0999997752b3d656b206933c4fd885baeedef01724fbcc7e141bb124a97448168c61cc88885df1891d728ccd86e6fadb039b6c9c1c03105f19e97abdb6ab8
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f8254365e..000000000000
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
---- a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ########### install files ###############
- 
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
deleted file mode 100644
index 11c110567fb0..000000000000
--- a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -525,10 +525,6 @@
-     endif()
-     endmacro()
- 
--    if (NOT PACKAGERS_BUILD)
--        # Optimize everything for the current architecture
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
--    endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
- 
diff --git a/media-gfx/krita/krita-3.0.ebuild b/media-gfx/krita/krita-3.0.ebuild
deleted file mode 100644
index ad9904973203..000000000000
--- a/media-gfx/krita/krita-3.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tgz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf +raw tiff vc"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? (
-		>=dev-libs/vc-0.7.4
-		<dev-libs/vc-0.7.5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_LibRaw=$(usex raw)
-		-DWITH_OCIO=$(usex color-management)
-		-DWITH_OpenJPEG=$(usex jpeg2k)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_Vc=$(usex vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-3.0.1.ebuild b/media-gfx/krita/krita-3.1.1.ebuild
similarity index 95%
rename from media-gfx/krita/krita-3.0.1.ebuild
rename to media-gfx/krita/krita-3.1.1.ebuild
index 7e00db7dc4d0..322285ef02e0 100644
--- a/media-gfx/krita/krita-3.0.1.ebuild
+++ b/media-gfx/krita/krita-3.1.1.ebuild
@@ -72,11 +72,6 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-breeze-collisions.patch"
-	"${FILESDIR}/${P}-vc-cxxflags.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_FFTW3=$(usex fftw)
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index b1146a053a10..7391f2ef2f81 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,4 +1,4 @@
 DIST wings-1.1.1.tar.bz2 1932572 SHA256 1a75a39a1a4586b242558a879d611adf1566b86785750f48ba60d851c2e40d08 SHA512 e60727328c9431738736466444655f54694973e59ad73e60874450845b080bf65c6b784ee0cb06cdff98f3717841dfbeceb5e36a1c55d98f31f280b972b7a2e3 WHIRLPOOL 9868a2ef5571291fa98db5239d767026d3cb0962c417bea77d7555ed2ff3d7fcded2200cad9347f5c0bb39591037fac9096cb7518f8285d2a3597a607c557d5e
 DIST wings-1.5.4.tar.bz2 6213585 SHA256 bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663 SHA512 fb0cab378703dad4a240f13b96b7522acb4c8466d01bc498e54baf8f4ff1ae497edc08f926889ff669f525ee9c6b787903a47fc78c66f2d9632a5fa45535ac3f WHIRLPOOL 1f0414b05b9b4a29bcc2288c31e68bf3c087b0f093951b4ed9c1f563567b3fa86aca57c595f5d656502d1962dc95902d810228845f284f588b24a1865ef759d4
-DIST wings-2.1.3.tar.bz2 2651435 SHA256 065029529ee3e9d5d9e38e0dc5b1187c43964861d8ab46df2b134d45fa937c13 SHA512 db6f26e7bf5788f02c0c0a8d9a35a1dc11a66e54cac0f36bd7f688c0a00c5d7c8ab16db2d6fbc72b710187215aa0508a23692212138f0d7f466770bf7ee6db6c WHIRLPOOL c280d51afd8de6040cc24af02b8560d2a7a282750a7cd5d4bbba8514256c63bcd6b77fdf40e6df82d0fab4a928506d331f5ad74056434ff075b06bef05fb274e
 DIST wings-2.1.4.1.tar.bz2 2654576 SHA256 5a827551fb2bd94db330d8b83bd2b6ca83f02394e6ceb56e2452d2decea0191e SHA512 55258877e5592abd64abb03d498d9d40f3fffb937cd05d05ccbf9eab58953430b3c17cf44d1df8d22c0aa05b7c95c83c26cc3638bda8244b7b9cbffb922c6872 WHIRLPOOL f530ee3a63e49236af8919aeeed667a11e2816123ab5d0357d2afcff7ab8d78cd5b187f6f724927f9e26d10a55fc4e0367413ad3936e3ad835c30a2efe449953
+DIST wings-2.1.5.tar.bz2 2653117 SHA256 f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0 WHIRLPOOL 3fd9c2008de69a6534d95c4e54d0b27d53e91efbfcabee5090abba03e23a25f8dea4a9ce5d9ec543e59dd2e773bb3ed2ad13c2824027bbe78296dad37a8db768
diff --git a/media-gfx/wings/wings-2.1.3.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
similarity index 100%
rename from media-gfx/wings/wings-2.1.3.ebuild
rename to media-gfx/wings/wings-2.1.5.ebuild
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index d0e76b5215b3..611c6f8237e7 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,2 +1,3 @@
 DIST CImg-1.5.2.zip 12824193 SHA256 4c6939d7d3c57752bb347362eca26eafb497571246d0d4c5f22d49721f8bc63f SHA512 a6927cecb524da128a58de9d655c2bb948bb61f654d6f95c7fe2690d39a521fea5313326610c2b56b370f76139f753469b7e4366196dd83db18c5a0c3b307b52 WHIRLPOOL f5141eac762a2e6124fd6f88d0c54da4398321b043640d83665bd0e66af51067846d2d61be309b45efbddc111ffa79c61d4569268d504cb10ffa60b96acffb82
 DIST cimg-1.7.8.tar.gz 17805881 SHA256 1033ad0816c79f067453120f358c27aa7392c138bc1a47d36397f8f9dd421220 SHA512 6d8f29ba5a98e340d2b0957775459778c811c028a2b0e59cb0d1fad46f1477ad21c7ff565fb71b12d38c67ede307d84c787cad35c28eeec0cec9e68f5b454798 WHIRLPOOL 5051102c7a41a86bc4c07add5c48b1922c0bc2df946558cdda0b5e8313d8d969f1dde17f7116fdefbaff3166e6030c46f245bc52a682b5c178b620d0a241c042
+DIST cimg-1.7.9.tar.gz 17828648 SHA256 adb0d77eded5dceae512d6c03233bdb01fe06121f8fdc661326e20da674caff8 SHA512 4a7f3316c3ebdd751f7e5b504eda3a990087de8e3b21c5df259eea2ba853d0094365f20e7715e488db77f9fdb4e7244058403f4710065f5959245de631dbbf4b WHIRLPOOL 7565922478c1877cac3daec99c6c1c6f3c8bed77b777a0119fa58aade095d5ab6f8f29872303f2f29dd764c3966dcc5830d13d2694e944af33b1f37c2967d238
diff --git a/media-libs/cimg/cimg-1.7.9.ebuild b/media-libs/cimg/cimg-1.7.9.ebuild
new file mode 100644
index 000000000000..a7732ae5ca13
--- /dev/null
+++ b/media-libs/cimg/cimg-1.7.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PV=${PV//./}
+MY_P="CImg-v.${MY_PV}"
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="http://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	dodoc README.txt
+	doheader CImg.h
+	use doc && dodoc -r html
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
index cca339c1921b..e96efb27d590 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 SRC_URI+=" https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-h264-patches.tar.xz"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.8.3-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.8.3-r1.ebuild
index 2c4212dfab3c..384cbb66b49f 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.8.3-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.8.3-r1.ebuild
@@ -11,11 +11,10 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
 REQUIRED_USE="
-	egl? ( !gles2 )
 	gles2? ( !opengl )
 	opengl? ( X )
 	wayland? ( egl )
diff --git a/media-libs/libcdr/libcdr-0.1.3.ebuild b/media-libs/libcdr/libcdr-0.1.3.ebuild
index d818832699f5..8417e5234f29 100644
--- a/media-libs/libcdr/libcdr-0.1.3.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.3.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
@@ -33,21 +32,20 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs) \
+		$(use_enable static-libs static) \
 		$(use_enable test tests)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild
index d818832699f5..8417e5234f29 100644
--- a/media-libs/libcdr/libcdr-9999.ebuild
+++ b/media-libs/libcdr/libcdr-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
@@ -33,21 +32,20 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs) \
+		$(use_enable static-libs static) \
 		$(use_enable test tests)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libfreehand/libfreehand-0.1.1.ebuild b/media-libs/libfreehand/libfreehand-0.1.1.ebuild
index ad5d0aa31b44..0b815bbb116d 100644
--- a/media-libs/libfreehand/libfreehand-0.1.1.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.1.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libfreehand/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library for import of FreeHand drawings"
@@ -39,13 +38,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild
index 091b546df1f8..4e89f60878cf 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libfreehand/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library for import of FreeHand drawings"
@@ -39,13 +38,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libgltf/libgltf-9999.ebuild b/media-libs/libgltf/libgltf-9999.ebuild
index f92074fea285..2bb53d266ea4 100644
--- a/media-libs/libgltf/libgltf-9999.ebuild
+++ b/media-libs/libgltf/libgltf-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://gerrit.libreoffice.org/libgltf.git"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="C++ Library for rendering OpenGL models stored in glTF format"
@@ -18,11 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug test"
 
-RDEPEND="virtual/opengl"
-
+RDEPEND="
+	>=media-libs/libepoxy-1.3.1
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	media-libs/glew:=
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -40,12 +40,11 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-werror \
 		$(use_enable test tests)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmatroska/libmatroska-1.4.5.ebuild b/media-libs/libmatroska/libmatroska-1.4.5.ebuild
index 87cf9a0bea74..5ad46277330d 100644
--- a/media-libs/libmatroska/libmatroska-1.4.5.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libebml-1.3.4:="
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
similarity index 85%
rename from media-libs/libpagemaker/libpagemaker-0.0.3.ebuild
rename to media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
index faf582e328ce..7ee5794e6bf7 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.3.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.3-r1.ebuild
@@ -22,20 +22,24 @@ RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.47
+	dev-libs/boost
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-werror \
-		$(use_enable tools) \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index faf582e328ce..7ee5794e6bf7 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -22,20 +22,24 @@ RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.47
+	dev-libs/boost
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-werror \
-		$(use_enable tools) \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libvisio/libvisio-0.1.5.ebuild b/media-libs/libvisio/libvisio-0.1.5.ebuild
index 32d5e6b8df74..827883f447ca 100644
--- a/media-libs/libvisio/libvisio-0.1.5.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.5.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit autotools eutils
+inherit autotools
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the visio documents"
@@ -26,7 +26,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	>=dev-libs/boost-1.46
+	dev-libs/boost
 	dev-util/gperf
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -37,23 +37,21 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch" )
 
 src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
+	default
 	[[ -d m4 ]] || mkdir "m4"
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs) \
+		$(use_enable static-libs static) \
 		$(use_enable test tests) \
 		$(use_enable tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 0adbb1cda8e2..9174356f6502 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the visio documents"
@@ -26,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	>=dev-libs/boost-1.46
+	dev-libs/boost
 	dev-util/gperf
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -35,22 +34,21 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	eapply_user
+	default
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs) \
+		$(use_enable static-libs static) \
 		$(use_enable test tests) \
 		$(use_enable tools)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/t1lib/t1lib-5.1.2-r1.ebuild b/media-libs/t1lib/t1lib-5.1.2-r1.ebuild
index 66d39fe74175..ab39f2a6be32 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r1.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 16f757a99a34..0be9b186fe09 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,3 +1,4 @@
 DIST live.2013.02.11.tar.gz 570837 SHA256 2cd619e61b9293a094a2cbb8dd7a7505f8e74e6197b80989093425ac78a86d83 SHA512 c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be WHIRLPOOL 121fb4815c44db793a3c225faa5c16e68a8f975e45e8c4d492886aa82a57dd1571ad14076375767524cb848336b702cccc9ab17af79787ac489b6eb789fd9bd9
 DIST live.2016.10.11.tar.gz 623691 SHA256 7b2b43c6d235bb6598851047b229af0e4d57b84de00ed9daa6c8cb45198797d7 SHA512 f7d5f4aee4eb3a11b4ac76ae16db2f33fba6cc3fd6e79d68c43c1d808024113829966f27aa52d9e8ac3346f6cccfcc4a23bc5ada997b6cdde4b013f046451edb WHIRLPOOL eaf3194d488a0bd18a508edc8fbed19f2fbcb7a14d0dfde6968d121586c86fb43fba15324aa7544fad1551f32cfadb019fe55edc6ff697f3c3d4a2d9f4e7a94e
 DIST live.2016.10.21.tar.gz 620822 SHA256 65b1aa7ec7c487466020e980d1fd68007390f7575b384c1d0fed49b94ba2c240 SHA512 10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5 WHIRLPOOL d503991a378f2397788895c3c2794b0a870b5935f9a89f8e3316a0095a9e852ac06978f6788138d9fb055611fa07d0cbfa013c99655ea481fab23d07b9253be9
+DIST live.2016.11.28.tar.gz 626781 SHA256 08b93a20bc302bed1da2f05621f37fda962dbfc272132afa6fa1058d222c238a SHA512 319639acef6474b2eec0bdfa3416ca3c88a60f57d9d22911eee018fc494978fde93a241556bc0ea309f0b6a35e0242bd44a8f4de83a845f80d9ca5f94254ade6 WHIRLPOOL 877c1d17dbd62437712d90702112feefc2b0c87aff06ebdf6abceb4f5508dd26b166cc125cc0916b72c90f6075dfcd4e82084490cc7c2dc703ab5fd042dfb420
diff --git a/media-plugins/live/live-2016.11.28.ebuild b/media-plugins/live/live-2016.11.28.ebuild
new file mode 100644
index 000000000000..adf2aeb6d3dc
--- /dev/null
+++ b/media-plugins/live/live-2016.11.28.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive3.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/media-sound/mpg123/mpg123-1.23.8.ebuild b/media-sound/mpg123/mpg123-1.23.8.ebuild
index 5b0ab5c87dee..6a8b7503dd91 100644
--- a/media-sound/mpg123/mpg123-1.23.8.ebuild
+++ b/media-sound/mpg123/mpg123-1.23.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~sparc-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 ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 30bd36995e74..ec65804eea2b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Dec 2016 20:43:15 +0000
+Sat, 17 Dec 2016 19:43:24 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 30bd36995e74..ec65804eea2b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Dec 2016 20:43:15 +0000
+Sat, 17 Dec 2016 19:43:24 +0000
diff --git a/metadata/md5-cache/app-admin/sshguard-1.7.0 b/metadata/md5-cache/app-admin/sshguard-1.7.0
index a257fdbc4ead..05f2a9be3a74 100644
--- a/metadata/md5-cache/app-admin/sshguard-1.7.0
+++ b/metadata/md5-cache/app-admin/sshguard-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=6
 HOMEPAGE=http://sshguard.sourceforge.net/
 IUSE=ipfilter kernel_FreeBSD kernel_linux
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-apps/openrc virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-1.7.0.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7497533df364ca743f01ec0d44a9e28b
+_md5_=29771835fbfa17c9624086812ee24ab0
diff --git a/metadata/md5-cache/app-arch/unrar-5.4.5 b/metadata/md5-cache/app-arch/unrar-5.4.5
index 14875d6d426a..c4f329536745 100644
--- a/metadata/md5-cache/app-arch/unrar-5.4.5
+++ b/metadata/md5-cache/app-arch/unrar-5.4.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=5
 HOMEPAGE=http://www.rarlab.com/rar_add.htm
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.4.5.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=25fa9a863b5db4c6e3fb1f15126d6259
+_md5_=73be0840ac8acfc83fc862992a30ae81
diff --git a/metadata/md5-cache/app-backup/kbackup-0.8-r1 b/metadata/md5-cache/app-backup/kbackup-0.8-r1
index 6379f552aa7a..e7f1c5f8e40a 100644
--- a/metadata/md5-cache/app-backup/kbackup-0.8-r1
+++ b/metadata/md5-cache/app-backup/kbackup-0.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://members.aon.at/m.koller/kbackup-0.8.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ec444a99f36ce1d780af21870db5b405
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.3-r2 b/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
index f104321f3cf4..93b7255a3a23 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] media-libs/libsamplerate dvd? ( media-l
 REQUIRED_USE=mp3? ( encode ) sox? ( encode )
 SLOT=4
 SRC_URI=mirror://kde/stable/k3b/k3b-2.0.3a.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=924c68eb46cba1037129accfe550be9c
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.3-r3 b/metadata/md5-cache/app-cdr/k3b-2.0.3-r3
index 7062be42c0ff..874caf4650dc 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.3-r3
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] media-libs/libsamplerate dvd? ( media-l
 REQUIRED_USE=mp3? ( encode ) sox? ( encode )
 SLOT=4
 SRC_URI=mirror://kde/stable/k3b/k3b-2.0.3a.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc453a91830ed5f3444f459151ca6d45
diff --git a/metadata/md5-cache/app-cdr/k9copy-2.3.8-r1 b/metadata/md5-cache/app-cdr/k9copy-2.3.8-r1
index a9689335f873..a61612879bb8 100644
--- a/metadata/md5-cache/app-cdr/k9copy-2.3.8-r1
+++ b/metadata/md5-cache/app-cdr/k9copy-2.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread media-libs/libmpeg2 media-libs/xine-lib media-video/ffmpeg media-video/dvdauthor mplayer? ( media-video/mplayer ) kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_es-AR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es-AR(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/k9copy/k9copy-2.3.8-Source.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9fc7a3b302c1b96b35880a5b2a7bfe59
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.5.0 b/metadata/md5-cache/app-cdr/kcdemu-0.5.0
index 65c24ec6d176..88a53e441c30 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.5.0
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-cdr/cdemu-2.0.0[cdemu-daemon] kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.5.0.tar.bz2 -> kcdemu-0.5.0.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ac73ec99e8155e7d81bc9b68a834873
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.24 b/metadata/md5-cache/app-crypt/ccid-1.4.24
index 766271029693..ecd63413b40e 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.24
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.24
@@ -4,10 +4,10 @@ DESCRIPTION=CCID free software driver
 EAPI=5
 HOMEPAGE=http://pcsclite.alioth.debian.org/ccid.html
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/file/4171/ccid-1.4.24.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338
-_md5_=a7e02a857ff574df21ccdb3b6514705c
+_md5_=bf9042c737a099c827ee278220ca4308
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.0106 b/metadata/md5-cache/app-editors/gvim-8.0.0106
index 4aac51de9647..e915feff3870 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.0106
+++ b/metadata/md5-cache/app-editors/gvim-8.0.0106
@@ -4,11 +4,11 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.0.0106 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ebc1c00f222717d433e0e58d9b0f678a
+_md5_=95c52e00cf6be46f158615875eb23119
diff --git a/metadata/md5-cache/app-editors/kile-2.1.3-r2 b/metadata/md5-cache/app-editors/kile-2.1.3-r2
index 83e964c62535..5a60d3f8b0dc 100644
--- a/metadata/md5-cache/app-editors/kile-2.1.3-r2
+++ b/metadata/md5-cache/app-editors/kile-2.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=x11-misc/shared-mime-info >=kde-apps/kdebase-data-4.4:4[aqua=] >=kde-apps/konsolepart-4.4:4[aqua=] || ( >=kde-apps/okular-4.4:4[aqua=,pdf?,postscript] app-text/acroread ) virtual/latex-base virtual/tex-base pdf? ( || ( app-text/dvipdfmx >=app-text/texlive-core-2014 ) app-text/ghostscript-gpl ) png? ( app-text/dvipng || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kile/kile-2.1.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=066cc027e63c95ec821ca083238a006a
diff --git a/metadata/md5-cache/app-editors/vim-8.0.0106 b/metadata/md5-cache/app-editors/vim-8.0.0106
index 0529d0026f77..f37d57699435 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.0106
+++ b/metadata/md5-cache/app-editors/vim-8.0.0106
@@ -4,11 +4,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0106 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=c248f1fa5e54b484bde955b93e08338e
+_md5_=20bd4938164ddd0ab8f548f0cae230c4
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.0106 b/metadata/md5-cache/app-editors/vim-core-8.0.0106
index 48df4ca08e30..248141eb664b 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.0106
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.0106
@@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.0106.tar.gz -> vim-8.0.0106.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=5a0112815d81f9010393ae7cc391c31e
+_md5_=5a9855d1ad33f30e179848edc43c97a8
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.5 b/metadata/md5-cache/app-emulation/containerd-0.2.5
new file mode 100644
index 000000000000..74e01dc8adbb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.4.2:=
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=hardened +seccomp
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=>=app-emulation/runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp )
+SLOT=0
+SRC_URI=https://github.com/docker/containerd/archive/v0.2.5.tar.gz -> containerd-0.2.5.tar.gz
+_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=c62e840c70b65f30b41c80e819b7b3b2
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-1.25.0 b/metadata/md5-cache/app-emulation/diskimage-builder-1.25.1
similarity index 99%
rename from metadata/md5-cache/app-emulation/diskimage-builder-1.25.0
rename to metadata/md5-cache/app-emulation/diskimage-builder-1.25.1
index 936d3a058634..fec6553aee4f 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-1.25.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-1.25.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-1.25.0.tar.gz
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-1.25.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6e654574bfcdac7e3c5052d25b01edec
diff --git a/metadata/md5-cache/app-misc/dateutils-0.4.1 b/metadata/md5-cache/app-misc/dateutils-0.4.1
new file mode 100644
index 000000000000..3ed71c271cef
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dateutils-0.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure test
+DEPEND=app-arch/xz-utils sys-libs/timezone-data
+DESCRIPTION=command line date and time utilities
+EAPI=6
+HOMEPAGE=https://hroptatyr.github.com/dateutils/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!sys-fabric/dapl
+SLOT=0
+SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.1.tar.xz
+_md5_=e05e4caf8c4d60ee033a76b311469cd9
diff --git a/metadata/md5-cache/app-misc/tmux-2.2 b/metadata/md5-cache/app-misc/tmux-2.2
index 78e81f562779..0b4b012c35ed 100644
--- a/metadata/md5-cache/app-misc/tmux-2.2
+++ b/metadata/md5-cache/app-misc/tmux-2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=6
 HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=|| ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) sys-libs/ncurses:0= selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/2.2/tmux-2.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d01caca9fbb476e58c4b0a5fff5bdf76
+_md5_=ea73db14bd03ecc0c71dbb592480e6bf
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.15 b/metadata/md5-cache/app-misc/workrave-1.10.15
index 75df393b5d6b..3c274883551c 100644
--- a/metadata/md5-cache/app-misc/workrave-1.10.15
+++ b/metadata/md5-cache/app-misc/workrave-1.10.15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu dev-python/cheetah >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive x11-proto/xproto x11-proto/inputproto x11-proto/recordproto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu dev-python/cheetah >=dev-util/intltool-0.40.0 sys-devel/autoconf-archive x11-proto/xproto x11-proto/inputproto x11-proto/recordproto virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
 EAPI=6
 HOMEPAGE=http://www.workrave.org/
 IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce python_targets_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu
 REQUIRED_USE=ayatana? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_15.tar.gz -> workrave-1.10.15.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=90d25ed99398145ed492c3cc1be3ccc1
+_md5_=48ad6c4863ad45a6679584fc0fcabcac
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.8 b/metadata/md5-cache/app-misc/workrave-1.10.8
deleted file mode 100644
index f0b50867237b..000000000000
--- a/metadata/md5-cache/app-misc/workrave-1.10.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu >=dev-util/intltool-0.40.0 x11-proto/xproto x11-proto/inputproto x11-proto/recordproto dev-python/cheetah virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
-EAPI=5
-HOMEPAGE=http://www.workrave.org/
-IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?] >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu
-REQUIRED_USE=ayatana? ( introspection )
-SLOT=0
-SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_8.tar.gz -> workrave-1.10.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=76b0d2c7866f0dca7385173d2174aa3a
diff --git a/metadata/md5-cache/app-office/calligra-2.9.11 b/metadata/md5-cache/app-office/calligra-2.9.11
index 555f96b4a422..165078d6fa18 100644
--- a/metadata/md5-cache/app-office/calligra-2.9.11
+++ b/metadata/md5-cache/app-office/calligra-2.9.11
@@ -12,5 +12,5 @@ REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_feat
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.9.11/calligra-2.9.11.tar.xz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3bd326d32113cc8b11c5ebc9210870c1
diff --git a/metadata/md5-cache/app-office/calligra-2.9.11-r1 b/metadata/md5-cache/app-office/calligra-2.9.11-r1
index be04cd3a3a92..09be03db4000 100644
--- a/metadata/md5-cache/app-office/calligra-2.9.11-r1
+++ b/metadata/md5-cache/app-office/calligra-2.9.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_feat
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.9.11/calligra-2.9.11.tar.xz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1255cc33054dc2819df95a6cbd4bc5ed
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.9.11 b/metadata/md5-cache/app-office/calligra-l10n-2.9.11
index 5a64b48e2020..f50130a70fb1 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.9.11
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.9.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-office/koffice-l10n kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=l10n_bs? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-bs-2.9.11.tar.xz ) l10n_ca? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ca-2.9.11.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ca@valencia-2.9.11.tar.xz ) l10n_cs? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-cs-2.9.11.tar.xz ) l10n_da? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-da-2.9.11.tar.xz ) l10n_de? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-de-2.9.11.tar.xz ) l10n_el? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-el-2.9.11.tar.xz ) l10n_en-GB? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-en_GB-2.9.11.tar.xz ) l10n_es? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-es-2.9.11.tar.xz ) l10n_et? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-et-2.9.11.tar.xz ) l10n_fi? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-fi-2.9.11.tar.xz ) l10n_fr? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-fr-2.9.11.tar.xz ) l10n_gl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-gl-2.9.11.tar.xz ) l10n_hu? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-hu-2.9.11.tar.xz ) l10n_it? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-it-2.9.11.tar.xz ) l10n_ja? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ja-2.9.11.tar.xz ) l10n_kk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-kk-2.9.11.tar.xz ) l10n_nb? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-nb-2.9.11.tar.xz ) l10n_nl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-nl-2.9.11.tar.xz ) l10n_pl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pl-2.9.11.tar.xz ) l10n_pt? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pt-2.9.11.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pt_BR-2.9.11.tar.xz ) l10n_ru? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ru-2.9.11.tar.xz ) l10n_sk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-sk-2.9.11.tar.xz ) l10n_sv? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-sv-2.9.11.tar.xz ) l10n_tr? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-tr-2.9.11.tar.xz ) l10n_uk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-uk-2.9.11.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-zh_CN-2.9.11.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-zh_TW-2.9.11.tar.xz )
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=db6405e8e47a00365950f9cfb4d3ed2c
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.9.11-r1 b/metadata/md5-cache/app-office/calligra-l10n-2.9.11-r1
index 738adfc2576e..1ca08b7b5213 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.9.11-r1
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.9.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-office/koffice-l10n kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=l10n_bs? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-bs-2.9.11.tar.xz ) l10n_ca? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ca-2.9.11.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ca@valencia-2.9.11.tar.xz ) l10n_cs? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-cs-2.9.11.tar.xz ) l10n_da? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-da-2.9.11.tar.xz ) l10n_de? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-de-2.9.11.tar.xz ) l10n_el? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-el-2.9.11.tar.xz ) l10n_en-GB? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-en_GB-2.9.11.tar.xz ) l10n_es? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-es-2.9.11.tar.xz ) l10n_et? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-et-2.9.11.tar.xz ) l10n_fi? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-fi-2.9.11.tar.xz ) l10n_fr? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-fr-2.9.11.tar.xz ) l10n_gl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-gl-2.9.11.tar.xz ) l10n_hu? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-hu-2.9.11.tar.xz ) l10n_it? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-it-2.9.11.tar.xz ) l10n_ja? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ja-2.9.11.tar.xz ) l10n_kk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-kk-2.9.11.tar.xz ) l10n_nb? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-nb-2.9.11.tar.xz ) l10n_nl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-nl-2.9.11.tar.xz ) l10n_pl? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pl-2.9.11.tar.xz ) l10n_pt? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pt-2.9.11.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-pt_BR-2.9.11.tar.xz ) l10n_ru? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-ru-2.9.11.tar.xz ) l10n_sk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-sk-2.9.11.tar.xz ) l10n_sv? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-sv-2.9.11.tar.xz ) l10n_tr? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-tr-2.9.11.tar.xz ) l10n_uk? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-uk-2.9.11.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-zh_CN-2.9.11.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/calligra-2.9.11/calligra-l10n/calligra-l10n-zh_TW-2.9.11.tar.xz )
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aacb77a6f21fdf196ca942d2a9fd49bd
diff --git a/metadata/md5-cache/app-office/kmymoney-4.7.2 b/metadata/md5-cache/app-office/kmymoney-4.7.2
index 4a16cf012229..9ab965726ce4 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.7.2
+++ b/metadata/md5-cache/app-office/kmymoney-4.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=app-office/libalkimia-4.3.2 dev-libs/gmp:0 dev-libs/libgpg-error >=kde-apps/kdepimlibs-4.4:4[aqua=] x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.0.1 >=sys-libs/gwenhywfar-4.0.1[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kmymoney/4.7.2/src/kmymoney-4.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=181a7e0aaf566bca61a45358bed76166
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.0 b/metadata/md5-cache/app-office/kmymoney-4.8.0
index 774cb0bd6b19..32db0beb584a 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.8.0
+++ b/metadata/md5-cache/app-office/kmymoney-4.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) pim? ( >=kde-apps/kdepimlibs-4.4:4[aqua=] ) !pim? ( app-crypt/gpgme[cxx] ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e387a3b6cacfdeaee702528392705526
diff --git a/metadata/md5-cache/app-office/kraft-0.59 b/metadata/md5-cache/app-office/kraft-0.59
index df25f3f34115..5a40c4766148 100644
--- a/metadata/md5-cache/app-office/kraft-0.59
+++ b/metadata/md5-cache/app-office/kraft-0.59
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/ctemplate dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[mysql,sqlite] >=kde-apps/kdepimlibs-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_ast? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ast(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kraft/kraft-0.59.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4934e492282fcde1c705d829e0961712
diff --git a/metadata/md5-cache/app-office/libalkimia-4.3.2-r1 b/metadata/md5-cache/app-office/libalkimia-4.3.2-r1
index fb3153e03a72..4d4dbde369d3 100644
--- a/metadata/md5-cache/app-office/libalkimia-4.3.2-r1
+++ b/metadata/md5-cache/app-office/libalkimia-4.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/gmp[cxx] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://kde-apps.org/CONTENT/content-files/137323-libalkimia-4.3.2.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a1102439c8ff138a0114e96389aa80a0
diff --git a/metadata/md5-cache/app-office/libreoffice-5.2.3.3-r1 b/metadata/md5-cache/app-office/libreoffice-5.2.3.3-r1
index 2a8be52d6ad1..6945a789ef53 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.2.3.3-r1
+++ b/metadata/md5-cache/app-office/libreoffice-5.2.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.2.3.3.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.2.3.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.2.3//libreoffice-5.2.3.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.2.3//libreoffice-help-5.2.3.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.2.3.3//libreoffice-5.2.3.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.2.3.3//libreoffice-help-5.2.3.3.tar.xz http://dev-www.libreoffice.org/src//ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5ca5f2b5f2b242e85d813541f6890035
diff --git a/metadata/md5-cache/app-office/libreoffice-5.2.4.2 b/metadata/md5-cache/app-office/libreoffice-5.2.4.2
new file mode 100644
index 000000000000..79fcd6b6b7c9
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-5.2.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.55:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.0:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-5.2*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.55:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= =dev-libs/liborcus-0.11* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection >=x11-libs/gtk+-3.8:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.2.4.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.2.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.2.4//libreoffice-5.2.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.2.4//libreoffice-help-5.2.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.2.4.2//libreoffice-5.2.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.2.4.2//libreoffice-help-5.2.4.2.tar.xz http://dev-www.libreoffice.org/src//ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3777048f94f8b2f0fa612d97e7070e87
diff --git a/metadata/md5-cache/app-office/libreoffice-5.2.9999 b/metadata/md5-cache/app-office/libreoffice-5.2.9999
index cf64a124a40e..971f8115eb05 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.2.9999
+++ b/metadata/md5-cache/app-office/libreoffice-5.2.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3777048f94f8b2f0fa612d97e7070e87
diff --git a/metadata/md5-cache/app-office/libreoffice-5.3.9999 b/metadata/md5-cache/app-office/libreoffice-5.3.9999
new file mode 100644
index 000000000000..d9ac9b7e4693
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-5.3.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND=!app-office/libreoffice-l10n
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=c5e255d4bafc3aa395688808ade38a06
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 6c8ee6e76fc6..4fe049ba56ef 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
 DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=http://www.libreoffice.org
 IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/glew-1.10:= media-libs/harfbuzz:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-arch/unzip app-arch/zip app-text/hunspell >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= >=dev-libs/liborcus-0.12.1 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X,-xlib-xcb] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( net-libs/telepathy-glib ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts media-fonts/libertine media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) kde? ( >=kde-apps/kioclient-4.4:4[aqua=] ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=38ee88e3ff4be2baa4bde0a639f20bc6
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e15777e1c0f62f9049b1638fa526eea4
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3 b/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
index 00d11cb82fc3..2833cd7ccfae 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.2.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.2.3.3.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.2.3.3.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.2.3.3.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.2.3.3.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.2.3.3.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.2.3.3.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.2.3.3.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.2.3.3.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.2.3.3.xd3 ) ) ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e45ed463761e6e41ab48518ec5f7bf71
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.2.4.1 b/metadata/md5-cache/app-office/libreoffice-l10n-5.2.4.1
new file mode 100644
index 000000000000..57cc23be33ce
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-5.2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-US.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_af.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ar.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_as.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_be.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_br.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_brx.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cy.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dgo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fa.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ga.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kok.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ks.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mai.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ml.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mni.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_my.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nso.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_oc.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_or.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ro.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_rw.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sat.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sid.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ss.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_st.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ta.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_te.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_th.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ts.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ve.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_xh.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( http://download.documentfoundation.org/libreoffice/stable/5.2.4/rpm/x86/LibreOffice_5.2.4_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.2.4/rpm/x86/LibreOffice_5.2.4.1_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3c6489843a02962443900d157d783242
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
index 88a1a0aac6d6..da75d80b013a 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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=GPL-2
 RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<=app-portage/gentoolkit-dev-0.2.7 sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.3.2.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fca0ea83bd46cd0982b06c8194d38416
+_md5_=0b6b1de3151ce3e2dcb5210f383193be
diff --git a/metadata/md5-cache/app-portage/kuroo4-0.90.5 b/metadata/md5-cache/app-portage/kuroo4-0.90.5
index d6808a800903..893bdd8fdb35 100644
--- a/metadata/md5-cache/app-portage/kuroo4-0.90.5
+++ b/metadata/md5-cache/app-portage/kuroo4-0.90.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 app-portage/gentoolkit >=kde-apps/kdesu-4.4:4[aqua=] kde-apps/kompare:* kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kuroo/kuroo4-0.90.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cce5a3eb9c8ade96fe3b45791e1e8ac7
diff --git a/metadata/md5-cache/app-shells/fish-2.4.0 b/metadata/md5-cache/app-shells/fish-2.4.0
index 3c14d5168f1f..fd08a4f941e2 100644
--- a/metadata/md5-cache/app-shells/fish-2.4.0
+++ b/metadata/md5-cache/app-shells/fish-2.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=6
 HOMEPAGE=http://fishshell.com/
 IUSE=X
-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=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-devel/bc sys-devel/gettext X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/2.4.0/fish-2.4.0.tar.gz
-_md5_=f2576c890ddc13b230efdf8dd05d725e
+_md5_=adf669ecffde1d7b1d6160236318c60d
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.4 b/metadata/md5-cache/app-text/dos2unix-7.3.4
index 012f77176a5a..5d5140b7785c 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.3.4
+++ b/metadata/md5-cache/app-text/dos2unix-7.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=6
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.4.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.4.tar.gz
 _eclasses_=l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b3e992db6880bff8852219b50a691775
+_md5_=320493561d4a5d02f89db3f7ba4a1808
diff --git a/metadata/md5-cache/app-text/kbibtex-0.6 b/metadata/md5-cache/app-text/kbibtex-0.6
index 01d0080f35a5..5d6dccbfe37b 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.6
+++ b/metadata/md5-cache/app-text/kbibtex-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt4] dev-libs/libxml2 dev-libs/libxslt dev-libs/qoauth:0 virtual/tex-base x11-libs/libqxt dev-tex/bibtex2html kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=http://download.gna.org/kbibtex/0.6/kbibtex-0.6.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e9cb89f42674037969a02f57d55cd92b
diff --git a/metadata/md5-cache/app-text/kding-0.6-r3 b/metadata/md5-cache/app-text/kding-0.6-r3
index 4f4a094df7b9..c7a2d629b286 100644
--- a/metadata/md5-cache/app-text/kding-0.6-r3
+++ b/metadata/md5-cache/app-text/kding-0.6-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.rexi.org/downloads/kding/kding-0.6.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=90843b926059701223cf760fc0beee9b
diff --git a/metadata/md5-cache/app-text/libabw-0.1.1 b/metadata/md5-cache/app-text/libabw-0.1.1
index 24425487a7fe..7ca37d0419cf 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.1
+++ b/metadata/md5-cache/app-text/libabw-0.1.1
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libabw/libabw-0.1.1.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5ef4c64dfb693e61a0e625ced1d2ec12
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=332e345ee670e742bc23526d42f1b9df
diff --git a/metadata/md5-cache/app-text/libebook-0.1.2-r1 b/metadata/md5-cache/app-text/libebook-0.1.2-r1
index 5cb551f25ee5..a8d7b759c799 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.2-r1
+++ b/metadata/md5-cache/app-text/libebook-0.1.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost:= dev-util/gperf virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/gperf virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library parsing various ebook formats
 EAPI=6
 HOMEPAGE=http://www.sourceforge.net/projects/libebook/
-IUSE=doc test
+IUSE=doc test tools
 KEYWORDS=amd64 ~arm x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=21839a4232eff1c15dd1bcec8edb505d
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=c9406d7bd56f330e7e842daac15c53e9
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.6 b/metadata/md5-cache/app-text/libetonyek-0.1.6
index 337a6f1e1df4..0a1261716fe6 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.6
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.6
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=>=app-text/liblangtag-0.5 dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.6.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=daae2d6c65b1363a15f72938dfe37adc
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=98e39ce0b5252edeff85b2458e305a1f
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 1a8157def67f..95198363190d 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e40393e7b519650de21010f55eb905cb
+_md5_=ac53099cba1e1e710ffe98b65d7dbb1a
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.2 b/metadata/md5-cache/app-text/libmspub-0.1.2
index de90edb47026..35c16463eb3d 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.2
+++ b/metadata/md5-cache/app-text/libmspub-0.1.2
@@ -9,5 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.2.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=240b109b01d71becc59e1504f1dc909b
+_md5_=6e491ab61a8f0bfd75f40946cb5d119f
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index 5f8ed12807dc..961388f1564c 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7893fdd5b26c661d20f89a0a9f265c35
+_md5_=ac2523a4c3db230602c253bf6075bdb3
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.8 b/metadata/md5-cache/app-text/libmwaw-0.3.8
index 02b078acbc4e..9d32947691e2 100644
--- a/metadata/md5-cache/app-text/libmwaw-0.3.8
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.8
@@ -1,13 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46:= sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=6
-HOMEPAGE=http://sourceforge.net/p/libmwaw/wiki/Home/
+HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
 IUSE=doc static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.8.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4b1f0ca376a6cadd486a563e2ef1df2c
+_md5_=fc7aea70489a65741e9daa79867cd3b2
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.9 b/metadata/md5-cache/app-text/libmwaw-0.3.9
index f3ba098b049b..913cdd4b6ce2 100644
--- a/metadata/md5-cache/app-text/libmwaw-0.3.9
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.9
@@ -1,13 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46:= sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=6
-HOMEPAGE=http://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs
+HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
+IUSE=doc static-libs tools
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.9.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=00e632e1c47e9e21c433a863f5ac6df5
+_md5_=e4586967edd1902fc0c3ef43d2418843
diff --git a/metadata/md5-cache/app-text/libmwaw-9999 b/metadata/md5-cache/app-text/libmwaw-9999
index 3c8aa0b83bdd..c8eeaba84e40 100644
--- a/metadata/md5-cache/app-text/libmwaw-9999
+++ b/metadata/md5-cache/app-text/libmwaw-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46:= sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=6
 HOMEPAGE=http://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs
+IUSE=doc static-libs tools
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=00e632e1c47e9e21c433a863f5ac6df5
+_md5_=5311c432f988dbf1ef7aeae6cb5bc7e0
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.6 b/metadata/md5-cache/app-text/libodfgen-0.1.6
index 58a13d517803..8b6044ec742f 100644
--- a/metadata/md5-cache/app-text/libodfgen-0.1.6
+++ b/metadata/md5-cache/app-text/libodfgen-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge >=dev-libs/boost-1.46 virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=6
 HOMEPAGE=http://libwpd.sf.net
@@ -9,5 +9,4 @@ LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.6.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4bde250a3bf47b1887057c7c65383e7c
+_md5_=af804b4f2e42c6598dad199ecd93fa0e
diff --git a/metadata/md5-cache/app-text/libodfgen-9999 b/metadata/md5-cache/app-text/libodfgen-9999
index d4033a7d011c..89ffd8f7cb03 100644
--- a/metadata/md5-cache/app-text/libodfgen-9999
+++ b/metadata/md5-cache/app-text/libodfgen-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/librevenge >=dev-libs/boost-1.46 virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=6
 HOMEPAGE=http://libwpd.sf.net
@@ -8,4 +8,4 @@ LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4bde250a3bf47b1887057c7c65383e7c
+_md5_=af804b4f2e42c6598dad199ecd93fa0e
diff --git a/metadata/md5-cache/app-text/libwpd-0.10.1 b/metadata/md5-cache/app-text/libwpd-0.10.1
index e22331d4fe60..cd87628def98 100644
--- a/metadata/md5-cache/app-text/libwpd-0.10.1
+++ b/metadata/md5-cache/app-text/libwpd-0.10.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm
 DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=WordPerfect Document import/export library
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libwpd.sf.net
 IUSE=doc +tools
 KEYWORDS=~alpha amd64 ~arm ~hppa ~mips x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge !<app-text/libwpd-0.8.14-r1
+RDEPEND=dev-libs/librevenge
 SLOT=0.10
 SRC_URI=mirror://sourceforge/libwpd/libwpd-0.10.1.tar.xz
-_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d5b47c73892eca2296c9a918f211edd0
+_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16
+_md5_=2100176a033be23cbe215b6d65493751
diff --git a/metadata/md5-cache/app-text/libwpg-0.3.1 b/metadata/md5-cache/app-text/libwpg-0.3.1
index 24756c819a71..84282b88f209 100644
--- a/metadata/md5-cache/app-text/libwpg-0.3.1
+++ b/metadata/md5-cache/app-text/libwpg-0.3.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install postinst postrm
 DEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=C++ library to read and parse graphics in WPG
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libwpg.sourceforge.net/libwpg.htm
 IUSE=doc static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~x86
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge
 SLOT=0.3
 SRC_URI=mirror://sourceforge/libwpg/libwpg-0.3.1.tar.xz
-_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=21186aeecf3da487f3ac92a7f2976853
+_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16
+_md5_=9c0cab15f7dc7a910cbaf5eca6cda2b0
diff --git a/metadata/md5-cache/app-text/libwps-0.4.4-r1 b/metadata/md5-cache/app-text/libwps-0.4.4-r1
index 0049255d64c3..c5042c139753 100644
--- a/metadata/md5-cache/app-text/libwps-0.4.4-r1
+++ b/metadata/md5-cache/app-text/libwps-0.4.4-r1
@@ -2,12 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=app-text/libwpd:0.10 dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Microsoft Works file word processor format import filter library
 EAPI=6
-HOMEPAGE=http://libwps.sourceforge.net/
-IUSE=doc debug static-libs
+HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
+IUSE=doc debug static-libs tools
 KEYWORDS=~alpha amd64 ~arm x86
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=app-text/libwpd:0.10 dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwps/libwps-0.4.4.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=717962df2aada37b2510a8af37cd69c5
+_md5_=122942c9925a16c8fc60742675bccd7c
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.5.2_pre20160820 b/metadata/md5-cache/dev-cpp/libcmis-0.5.2_pre20160820
index b7d7722d9f56..e5a031033371 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-0.5.2_pre20160820
+++ b/metadata/md5-cache/dev-cpp/libcmis-0.5.2_pre20160820
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl !<dev-cpp/libcmis-0.5.0
 SLOT=0.5
 SRC_URI=https://github.com/tdf/libcmis/archive/da8c3fdc281a0cb3753a6bb9eaa63ac6385e2963.tar.gz -> libcmis-0.5.2_pre20160820.tar.gz
-_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6956ad126349d59d72bd416ad63fbabf
+_eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=6ae51f26d11ea05cc8e54f82c042ad30
diff --git a/metadata/md5-cache/dev-cpp/libcmis-9999 b/metadata/md5-cache/dev-cpp/libcmis-9999
index 7a1f6ee0e6fb..32138ad4bf8a 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-9999
+++ b/metadata/md5-cache/dev-cpp/libcmis-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl !<dev-cpp/libcmis-0.5.0
 SLOT=0.5
 _eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c9f63457947c7e2758e04c5080e8e3d1
+_md5_=626b0b39d6093aefaf62ee6f66eec921
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.19 b/metadata/md5-cache/dev-db/mariadb-10.1.20
similarity index 95%
rename from metadata/md5-cache/dev-db/mariadb-10.1.19
rename to metadata/md5-cache/dev-db/mariadb-10.1.20
index 3b25b0104c01..e02fc196d07e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.19
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.20
@@ -8,9 +8,9 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2
 PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6[embedded=,static=] virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=server? ( tokudb? ( jemalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+REQUIRED_USE=server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.19/source/mariadb-10.1.19.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.20/source/mariadb-10.1.20.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-multilib-r1	6a82189013ed0dabf468cfe7c55fef1d	prefix	99dcca42e6528d8fe3c214bf5731aaf2	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ad08dfa47f93f91abfa2534aefc017d
+_md5_=f5ff4f9d008540d814025ca9012fbbe5
diff --git a/metadata/md5-cache/dev-db/postgresql-9.1.24 b/metadata/md5-cache/dev-db/postgresql-9.1.24
index f524b95dcce7..8a8a8f115655 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.1.24
+++ b/metadata/md5-cache/dev-db/postgresql-9.1.24
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.1 !dev-db/postgresql-base:9.1 !dev-db/postgresql-server:9.1 selinux? ( sec-policy/selinux-postgresql )
 RESTRICT=test
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.24/postgresql-9.1.24.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7fa39e50e418e78a8e42bb99c385501d
+_md5_=c25383c430b0fccf72ba54d2e26fab45
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.19 b/metadata/md5-cache/dev-db/postgresql-9.2.19
index fd790e818ca1..e1dbefbe46a2 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.19
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.19/postgresql-9.2.19.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2a12d0212301a7ae5627acc975f74d1c
+_md5_=7ff8ffb6b6b636248abb27449de4c4ac
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.15 b/metadata/md5-cache/dev-db/postgresql-9.3.15
index a09131e83134..cd0d511c5c4a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.15
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.15/postgresql-9.3.15.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a6e1e37e9fdc1b326b32e28edb365ac
+_md5_=ec3519d4fcf303f09b536b09ff93bdb3
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.10 b/metadata/md5-cache/dev-db/postgresql-9.4.10
index 82c9ec2ef8b7..3415c7b66175 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.10
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.10/postgresql-9.4.10.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=23423d53d34ff6855d5abeb8f8445a19
+_md5_=09a94e4a8eb3a4c2fb3f47f2d684311c
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.5 b/metadata/md5-cache/dev-db/postgresql-9.5.5
index ba2b9b630d71..7b77cc2dc93b 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.5
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.5
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.5/postgresql-9.5.5.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aa98e02703e5a2a3fe3387b77b41a923
+_md5_=745d1205ee0a643eff0105e0b532945f
diff --git a/metadata/md5-cache/dev-lang/go-1.7.4 b/metadata/md5-cache/dev-lang/go-1.7.4
index dec0a6b3a46d..121ac070d1b8 100644
--- a/metadata/md5-cache/dev-lang/go-1.7.4
+++ b/metadata/md5-cache/dev-lang/go-1.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=http://www.golang.org
 IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 SLOT=0/1.7.4
 SRC_URI=!gccgo? ( kernel_Darwin? ( x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap.tbz ) ) kernel_FreeBSD? ( amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.tbz ) ) kernel_linux? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.tbz ) ) kernel_SunOS? ( x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap.tbz ) ) ) https://storage.googleapis.com/golang/go1.7.4.src.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=04998f221bb882504d953ded1893ae32
+_md5_=30000fe2c4accaec289d81da62c3e917
diff --git a/metadata/md5-cache/dev-lang/perl-5.22.3_rc4 b/metadata/md5-cache/dev-lang/perl-5.22.3_rc4
index c11e296f2af6..5cf77bb76539 100644
--- a/metadata/md5-cache/dev-lang/perl-5.22.3_rc4
+++ b/metadata/md5-cache/dev-lang/perl-5.22.3_rc4
@@ -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 ~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
+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 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.22
 SRC_URI=mirror://cpan/src/5.0/perl-5.22.3-RC4.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.22.3-RC4.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.22.3-RC4-patches-1/perl-5.22.3-RC4-patches-1.tar.xz mirror://gentoo/perl-5.22.3-RC4-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.22.3-RC4-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.1/perl-cross-1.1.1.tar.gz
 _eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=db97007de618c5e28494ac316b456bbb
+_md5_=306a7e92dc47705c48a74192022b0afd
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.4 b/metadata/md5-cache/dev-libs/libebml-1.3.4
index 588068a5d53b..c1ce93ddac25 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.4
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.4
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=6
 HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libebml/
 IUSE=debug static-libs
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=http://dl.matroska.org/downloads/libebml/libebml-1.3.4.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b578c016bfa2cc4145524764780baa9c
+_md5_=b4585507e19de0a7122575c20aa93d2a
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.11.2 b/metadata/md5-cache/dev-libs/liborcus-0.11.2
index 9d471aec113b..990e42cca2b8 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.11.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.11.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= ) >=dev-util/mdds-1.2.0:1
+DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= ) >=dev-util/mdds-1.2.0:1
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= )
+RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.11.1:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/0.11
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.11.2.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c6855e13efcba3dc06b241193ef522ea
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=f68eea9f61fb7b255e17b97b85d98ad8
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.12.1 b/metadata/md5-cache/dev-libs/liborcus-0.12.1
index c365ecb62896..c9f456f64f92 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.12.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.12.1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/0.12
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.12.1.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b05904121f57470ed0f1a1fe5c10f8ed
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=f45399fb1fc1ce4f035fb232baa714b8
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index ef35979b61f8..80173d4f15b3 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/0.12
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2034b5babcd72d38651ca6ac4826e89c
+_md5_=9406eecd6e976149a24382acb22d8367
diff --git a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0 b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
index b13f3c298542..18e75ce8327a 100644
--- a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
+++ b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libzeitgeist dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4
 SLOT=4
 SRC_URI=mirror://kde/stable/libqzeitgeist/0.8.0/src/libqzeitgeist-0.8.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1ec94d2464e76cf0f4841be3298f27a
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4 b/metadata/md5-cache/dev-libs/librevenge-0.0.4
index 945e660d4a2d..fb9cb2ce7acb 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) test? ( dev-util/cppunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A helper library for REVerse ENGineered formats filters
-EAPI=5
+EAPI=6
 HOMEPAGE=http://sf.net/p/libwpd/librevenge
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc64 x86 ~x86-fbsd
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3afe86b3c6e922019dda7b5514d2da58
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=099482a5c8162681a5859fe54c60e602
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index 11991a5db84d..2944f31dd2fa 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6d0d5143ed1fa5d55d78833d930354e5
+_md5_=d9c000e1c90fbccef4e75b3664fa44aa
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.9-r1 b/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
index 6f1c914da197..7cd5edfa0d84 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.9.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3c781b672e34175395db80cea6b3ae9c
+_md5_=ad71da284e4e963fac46954a9ebdbb6f
diff --git a/metadata/md5-cache/dev-lisp/clx-0.7.4 b/metadata/md5-cache/dev-lisp/clx-0.7.4
index c0f24fc34a43..23a9e6ccd3f9 100644
--- a/metadata/md5-cache/dev-lisp/clx-0.7.4
+++ b/metadata/md5-cache/dev-lisp/clx-0.7.4
@@ -5,11 +5,11 @@ EAPI=5
 HOMEPAGE=http://www.cliki.net/CLX
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=CLX
+LICENSE=HPND
 PDEPEND=virtual/commonlisp
 RDEPEND=!dev-lisp/cl-clx
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://common-lisp.net/~abridgewater/dist/clx/clx-0.7.4.tgz
 _eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f3b757a98a841382ed5c894156027d33
+_md5_=e25426ca053d30eae8962db74e41fb4c
diff --git a/metadata/md5-cache/dev-lisp/clx-9999 b/metadata/md5-cache/dev-lisp/clx-9999
index 293e4db192e0..0acc53cf4642 100644
--- a/metadata/md5-cache/dev-lisp/clx-9999
+++ b/metadata/md5-cache/dev-lisp/clx-9999
@@ -1,12 +1,11 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=A fork of crhodes' fork of danb's fork of the CLX library, an X11 client for Common Lisp
-EAPI=5
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=A fork of crhodes' fork of danb's fork of CLX, an X11 client for Common Lisp
+EAPI=6
 HOMEPAGE=https://github.com/sharplispers/clx http://www.cliki.net/CLX
-LICENSE=CLX
+LICENSE=MIT
 PDEPEND=virtual/commonlisp
-RDEPEND=!dev-lisp/cl-clx
 RESTRICT=mirror
 SLOT=0
-_eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	b83a2420b796f7c6eff682679d08fe25	git-2	7af5d170bfc02983b4bcd3167dc5edd4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c282ebdf09d4ebdd228c2e8d2c59a611
+_eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=f842edaf0482692be1dc4bcd17ce9857
diff --git a/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1 b/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
index 9edc25a024ce..764c72289f32 100644
--- a/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
+++ b/metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install nofetch
 DESCRIPTION=Common Lisp ANSI-standard Hyperspec
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.lispworks.com/reference/HyperSpec/
 KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
 LICENSE=HyperSpec
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=ftp://ftp.lispworks.com/pub/software_tools/reference/HyperSpec-7-0.tar.gz
-_md5_=76a62c34520862bfa73229098b56864b
+_md5_=6dd8fdb160ff12bb7a12db352608804f
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.4 b/metadata/md5-cache/dev-ml/iTeML-2.4
new file mode 100644
index 000000000000..14f03e9ff9b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/iTeML-2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] !dev-ml/qckeck >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Inline (Unit) Tests for OCaml
+EAPI=5
+HOMEPAGE=https://github.com/vincent-hugot/iTeML
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] !dev-ml/qckeck
+SLOT=0/2.4
+SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.4.tar.gz -> iTeML-2.4.tar.gz
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=83c529d0388f6df07587157b0b84fff9
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
new file mode 100644
index 000000000000..e517cbadda0d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Library for binding to C libraries using pure OCaml
+EAPI=5
+HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+SLOT=0/0.11.2
+SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.2.tar.gz -> ocaml-ctypes-0.11.2.tar.gz
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=bdbeec80c14ac764a9bcf3a032f0d1e7
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.3 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.3
deleted file mode 100644
index fa097e0a0f09..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-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?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/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/4.0.3
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.0.3/sqlite3-ocaml-4.0.3.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b235c33a6217da93f33997ca3c90034f
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.5 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.5
deleted file mode 100644
index 05ed32afcd04..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-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?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/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/4.0.5
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.0.5/sqlite3-ocaml-4.0.5.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0ed408281dd92735af1be4fe6d1b8cb2
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.4 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.0
similarity index 94%
rename from metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.4
rename to metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.0
index 34c1f97a9c7a..739d395bb0fd 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.0.4
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.0
@@ -7,7 +7,7 @@ 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/4.0.4
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.0.4/sqlite3-ocaml-4.0.4.tar.gz
+SLOT=0/4.1.0
+SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.0/sqlite3-ocaml-4.1.0.tar.gz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=0ed408281dd92735af1be4fe6d1b8cb2
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
index 705c39433335..961af2571f9f 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
@@ -4,11 +4,11 @@ DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-mysql/
 IUSE=embedded test +ssl
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
 REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.041.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ccf42c54c4082e114b698e7c9bc6595d
+_md5_=054e78b27ab679b5b4d13fd14bd736d4
diff --git a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0 b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
index 672dc7448482..fe474c4a0651 100644
--- a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+++ b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/DBI virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker dev-la
 DESCRIPTION=Database-independent schema objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBIx-DBSchema/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=8ae4e6be0c024527027587fc5b63aa49
+_md5_=ac0403b5417ad56813ad939ce047d5a1
diff --git a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0 b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
index a088bd35f98b..a0bf8c1f3770 100644
--- a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=parse and validate simple name/value option pairs
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-OptList/
 IUSE=test
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=68b966da8d59a2c1b06b16a4fd1b1d37
+_md5_=dab195d600cdf2aea9be1d750cb70936
diff --git a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0 b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
index 2df1c35b27c4..3ac859e578ec 100644
--- a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
+++ b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Declare version conflicts for your dist
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Dist-CheckConflicts/
 IUSE=test
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Runtime-0.9.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=109bccf02bf15604b91e7d3e58ee628d
+_md5_=bb99bff364c386338c025012bc86f4bc
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
new file mode 100644
index 000000000000..9dd05ad13196
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Encode >=dev-perl/File-BaseDir-0.30.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/URI >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Object to handle .desktop files
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/File-DesktopEntry/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Encode >=dev-perl/File-BaseDir-0.30.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/URI dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
+_md5_=6bed8719a42e7778b94614a34cb9417b
diff --git a/metadata/md5-cache/dev-perl/Math-Base-Convert-0.110.0 b/metadata/md5-cache/dev-perl/Math-Base-Convert-0.110.0
index 18534f99f168..022d4c1f8d82 100644
--- a/metadata/md5-cache/dev-perl/Math-Base-Convert-0.110.0
+++ b/metadata/md5-cache/dev-perl/Math-Base-Convert-0.110.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Very fast base to base conversion
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-Base-Convert/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/Math-Base-Convert-0.11.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=fc250dd3663ae31aae91bb2da7ac777f
+_md5_=503898e165a97822f290c28a37a6c172
diff --git a/metadata/md5-cache/dev-perl/SQL-Statement-1.410.0 b/metadata/md5-cache/dev-perl/SQL-Statement-1.410.0
index 76ebbd868086..f4742157cf35 100644
--- a/metadata/md5-cache/dev-perl/SQL-Statement-1.410.0
+++ b/metadata/md5-cache/dev-perl/SQL-Statement-1.410.0
@@ -4,10 +4,10 @@ DESCRIPTION=Small SQL parser and engine
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/SQL-Statement/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 >=dev-perl/Text-Soundex-3.40.0 ) virtual/perl-Carp >=dev-perl/Clone-0.300.0 virtual/perl-Data-Dumper dev-perl/Module-Runtime >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-Text-Balanced dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.410.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=99c7e0e802a4b2c94ac52415abc857e3
+_md5_=c69adde793192a006f5c8388de847fda
diff --git a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0 b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
index 7d908551d58a..26aff69c81d8 100644
--- a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
+++ b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Implementation of the soundex algorithm
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Text-Soundex/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=f2f6d68dcc9ad1571b3fc3121eebe42f
+_md5_=fe3795e7765cf4a09b6394eca4221855
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.10.0 b/metadata/md5-cache/dev-python/oslo-messaging-5.10.0
deleted file mode 100644
index 8261d1e293d7..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cachetools-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-amqp-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/py-amqp-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/kombu-3.0.25[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-pool-0.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-5.10.0.tar.gz
-_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bc9310dd30b427d352fa39c847679103
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.10.0-r1 b/metadata/md5-cache/dev-python/oslo-messaging-5.10.0-r1
deleted file mode 100644
index a68da530fd8e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cachetools-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-amqp-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/py-amqp-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/kombu-3.0.25[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/kombu-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-pool-0.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-5.10.0.tar.gz
-_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fd32714036d0bfbd281f8b6641280cbd
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-5.10.1 b/metadata/md5-cache/dev-python/oslo-messaging-5.10.1
index 9a75d940d785..85ebf5d35128 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-5.10.1
+++ b/metadata/md5-cache/dev-python/oslo-messaging-5.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Messaging API for RPC and notifications over different messaging tra
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cachetools-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/py-amqp-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/py-amqp-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/kombu-3.0.25[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/kombu-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pika-pool-0.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-5.10.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fd32714036d0bfbd281f8b6641280cbd
+_md5_=c750f26ccc8bc2bc7512cb8d7f070bb3
diff --git a/metadata/md5-cache/dev-python/paramiko-2.0.2 b/metadata/md5-cache/dev-python/paramiko-2.0.2
index ce86ddea3772..5ef4e353a33c 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.0.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-2.0.2.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cfdc573d48d3065e1d8905d59a107dec
+_md5_=cffb2b10415323f3e2a36aeba13a7947
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-1.7.1 b/metadata/md5-cache/dev-python/python-ironicclient-1.7.1
index 07ba3735ae57..56149ca75228 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-1.7.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Ironic API
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-1.7.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3b380c88b29e71fd3c55381592192043
+_md5_=c753a356903193c2bcaa9688e0e63e8a
diff --git a/metadata/md5-cache/dev-python/soappy-0.12.22 b/metadata/md5-cache/dev-python/soappy-0.12.22
index 7501a368ad0b..1229394c3180 100644
--- a/metadata/md5-cache/dev-python/soappy-0.12.22
+++ b/metadata/md5-cache/dev-python/soappy-0.12.22
@@ -4,11 +4,11 @@ DESCRIPTION=SOAP Services for Python
 EAPI=5
 HOMEPAGE=http://pywebsvcs.sourceforge.net/ https://pypi.python.org/pypi/SOAPpy
 IUSE=examples ssl python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/wstools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SOAPpy/SOAPpy-0.12.22.zip
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c2573e85010e9801986911abab5a70fe
+_md5_=cd3f7ded5fa7cf7f15fda1c72779af51
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0 b/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0
index 3bfb1b93043f..c3e61dc72565 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.7.1_p0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install prepare
 DEPEND=app-arch/p7zip
 DESCRIPTION=Documentation for Qt5, for use with Qt Creator and other tools
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=FDL-1.3
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_57_src_doc_examples/qt.57.doc/5.7.1-0qt-everywhere-documentation-5.7.1.7z
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d258a23ad5ecb48fbe98b36e1acb51fc
+_md5_=727287f91714575faa537e4976de2a00
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
index 06c11bdbd789..7be077ea64fb 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=An object-oriented AST extension for Parser
 EAPI=5
 HOMEPAGE=https://github.com/yujinakayama/astrolabe
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.1.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=328c3d6b582fab0ff7e063a488a98ed5
+_md5_=ab389fa8f8a5b520b64ae31f629b143f
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
index 02b01d1c883c..6c089737646f 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Retrieve the binding of a method's caller
 EAPI=5
 HOMEPAGE=https://github.com/banister/binding_of_caller
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/binding_of_caller-0.7.2.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=258af760488931659da309d815d9b310
+_md5_=9ccf1e0b9d41a9ab7633e71cc893a2c1
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
new file mode 100644
index 000000000000..a2f00d3fd779
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
+EAPI=5
+HOMEPAGE=http://coffeescript.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/coffee-script-source-1.12.2.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1bed787efb2304d7a36586e8b32d2229
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.7 b/metadata/md5-cache/dev-ruby/colorize-0.7.7
deleted file mode 100644
index 07750a1aa0e7..000000000000
--- a/metadata/md5-cache/dev-ruby/colorize-0.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Adds methods to set color, background color and text effect on console easier
-EAPI=5
-HOMEPAGE=https://github.com/fazibear/colorize
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/colorize-0.7.7.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7c34813a0fe062cdd7bc003e9250e09
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.0 b/metadata/md5-cache/dev-ruby/colorize-0.8.0
deleted file mode 100644
index 0d4a7a1f691b..000000000000
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Adds methods to set color, background color and text effect on console easier
-EAPI=5
-HOMEPAGE=https://github.com/fazibear/colorize
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/colorize-0.8.0.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6fe131ae9822fdbfb8dbfd5911daeb8d
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.1 b/metadata/md5-cache/dev-ruby/commander-4.4.1
index 32e25bbff1f0..6af341ee9829 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.1
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] =dev-ruby/highline-1.7*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] =dev-ruby/highline-1.7*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=The complete solution for Ruby command-line executables
 EAPI=5
 HOMEPAGE=https://visionmedia.github.com/commander/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] =dev-ruby/highline-1.7*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] =dev-ruby/highline-1.7*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby21] =dev-ruby/highline-1.7*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby22] =dev-ruby/highline-1.7*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.1.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=521b03b0f3b15dec043adce53eb0b4c1
+_md5_=e22a2e91f8f79bde8bc585736aa2e74a
diff --git a/metadata/md5-cache/dev-ruby/plist-3.2.0 b/metadata/md5-cache/dev-ruby/plist-3.2.0
index b5b5b6a4faae..19fc68910da4 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.2.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ru
 SLOT=0
 SRC_URI=mirror://rubygems/plist-3.2.0.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=736f6733fdb2cff839f2fcd0a0cd0471
+_md5_=309c42fea4a5188ba2026a08c7927601
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.2 b/metadata/md5-cache/dev-ruby/sshkit-1.11.2
deleted file mode 100644
index 2fd9f3f4a6ac..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.11.2.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6dc6a17c75379a73284031b48884e4dc
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.3 b/metadata/md5-cache/dev-ruby/sshkit-1.11.3
deleted file mode 100644
index b831063919af..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.11.3.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6dc6a17c75379a73284031b48884e4dc
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.11.5 b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
new file mode 100644
index 000000000000..a5fb39dd4a7d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.11.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
+EAPI=5
+HOMEPAGE=https://github.com/capistrano/sshkit
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/sshkit-1.11.5.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=25c34d21a8ab0b575e02fe2bfde6e9eb
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
deleted file mode 100644
index 69c4d8217604..000000000000
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby bindings for Tokyo Cabinet
-EAPI=5
-HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/tokyocabinet ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/tokyocabinet-1.29.1.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=292ceb00b92afb8c5a7167aaddd0f2e5
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.0 b/metadata/md5-cache/dev-ruby/trollop-2.0
deleted file mode 100644
index 84a69b5a956a..000000000000
--- a/metadata/md5-cache/dev-ruby/trollop-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Trollop is a commandline option parser for Ruby
-EAPI=5
-HOMEPAGE=http://trollop.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=2
-SRC_URI=mirror://rubygems/trollop-2.0.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f52c151e3fd4c7890a3656e5f26f188c
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
index 7418e6f3908c..17281743d057 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A TrueType font parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/prawnpdf/ttfunk/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 Ruby )
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.1.tar.gz -> ttfunk-1.2.1.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d11131d53d13a6cdab8e4078e9c8282d
+_md5_=c07ce69f14e6035d52d331b57650da92
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index 8118d3424982..ffd44228612b 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Gem provides enforced-type functionality to Arrays
 EAPI=5
 HOMEPAGE=https://github.com/yaauie/typed-array
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/typed-array-0.1.2.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e33ea3e06596964bd0550b85dcae719c
+_md5_=3787243dc780c62fed493d52753dde1d
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.5 b/metadata/md5-cache/dev-ruby/warden-1.2.5
deleted file mode 100644
index dd48284c6187..000000000000
--- a/metadata/md5-cache/dev-ruby/warden-1.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=General Rack Authentication Framework
-EAPI=5
-HOMEPAGE=https://github.com/hassox/warden
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/warden-1.2.5.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b333a9c6d8c81420a4a2041edb8f93b
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.6 b/metadata/md5-cache/dev-ruby/warden-1.2.6
index 699ff388119d..014efe023047 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.6
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=General Rack Authentication Framework
 EAPI=5
 HOMEPAGE=https://github.com/hassox/warden
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.6.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b333a9c6d8c81420a4a2041edb8f93b
+_md5_=6d25680b5125401ec8b6c3adb062b577
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
index 5132e53e427c..5465486e4d01 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/shoulda[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/shoulda[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/shoulda[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/shoulda[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A library to help write robots.txt compliant web robots
 EAPI=5
 HOMEPAGE=https://github.com/knu/webrobots
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=19be8a3e2ed78afdd0a0b4114314a6b0
+_md5_=3aa007a943c3e3067bdf74ad00af9ea9
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.2 b/metadata/md5-cache/dev-ruby/websocket-1.2.2
deleted file mode 100644
index 6e18b6a65f7b..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Universal Ruby library to handle WebSocket protocol
-EAPI=5
-HOMEPAGE=https://github.com/imanel/websocket-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/websocket-1.2.2.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0317ecf7dcd9699ffa24c6808388f982
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4 b/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4
deleted file mode 100644
index 2f2e353e4300..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=5
-HOMEPAGE=https://github.com/faye/websocket-driver
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/websocket-driver-0.3.4.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=063bcd9d0e3795a35f5952e7815e6e1d
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2
deleted file mode 100644
index 689a761c3055..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=5
-HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.2.tar.gz -> websocket-driver-0.6.2.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2af6deeda98d9e7d7c46d3e2cf53a6e8
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3
deleted file mode 100644
index be8a9f969cad..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A complete implementation of the WebSocket protocols
-EAPI=5
-HOMEPAGE=https://github.com/faye/websocket-driver-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.3.tar.gz -> websocket-driver-0.6.3.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9171a78015b853186e8971aeb007223d
diff --git a/metadata/md5-cache/dev-util/cmake-3.6.3 b/metadata/md5-cache/dev-util/cmake-3.6.3
index 33658d6af99b..19f474a32935 100644
--- a/metadata/md5-cache/dev-util/cmake-3.6.3
+++ b/metadata/md5-cache/dev-util/cmake-3.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=http://www.cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v3.6/cmake-3.6.3.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	16e40479aefbbed67ea20779992ab90e	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=84b5489a997bfadc529aebe7045879c9
+_md5_=bb47032efc06b80448d6375d7325132a
diff --git a/metadata/md5-cache/dev-util/cmake-3.7.0-r1 b/metadata/md5-cache/dev-util/cmake-3.7.0-r1
deleted file mode 100644
index 036b675dfe59..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.7.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Cross platform Make
-EAPI=6
-HOMEPAGE=http://www.cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-SLOT=0
-SRC_URI=http://www.cmake.org/files/v3.7/cmake-3.7.0.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	16e40479aefbbed67ea20779992ab90e	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=567c4f7311bfaab1f8b6d6da8af53ecb
diff --git a/metadata/md5-cache/dev-util/icemon-20140102 b/metadata/md5-cache/dev-util/icemon-20140102
index ce80b511ba16..d9c75ff3ecc6 100644
--- a/metadata/md5-cache/dev-util/icemon-20140102
+++ b/metadata/md5-cache/dev-util/icemon-20140102
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/icecream kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/icemon-20140102.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=17bf164a044781a6db8b9174f29f1ec1
diff --git a/metadata/md5-cache/dev-util/kdbg-2.5.6 b/metadata/md5-cache/dev-util/kdbg-2.5.6
index f47454a3313e..a52dbff584e4 100644
--- a/metadata/md5-cache/dev-util/kdbg-2.5.6
+++ b/metadata/md5-cache/dev-util/kdbg-2.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gdb kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kdbg/kdbg-2.5.6.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=92671fbecaa83f9a42b1abe0bd5f7278
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.7.2 b/metadata/md5-cache/dev-util/kdevelop-4.7.2
index f7ee23ce4e0c..9b92938414eb 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.7.2
+++ b/metadata/md5-cache/dev-util/kdevelop-4.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( kde-plasma/ksysgu
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevelop-4.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2491499f9000f0d2702a7f143f65ee88
diff --git a/metadata/md5-cache/dev-util/kdevelop-4.7.3 b/metadata/md5-cache/dev-util/kdevelop-4.7.4
similarity index 93%
rename from metadata/md5-cache/dev-util/kdevelop-4.7.3
rename to metadata/md5-cache/dev-util/kdevelop-4.7.4
index 371ed21c6211..bc76733ff36a 100644
--- a/metadata/md5-cache/dev-util/kdevelop-4.7.3
+++ b/metadata/md5-cache/dev-util/kdevelop-4.7.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 ) okteta? ( >=kde-apps/okteta-4.4:4[aqua=] ) qthelp? ( dev-qt/qthelp:4 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.3:4
+DEPEND=dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 ) okteta? ( >=kde-apps/okteta-4.4:4[aqua=] ) qthelp? ( dev-qt/qthelp:4 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.4:4
 DESCRIPTION=Integrated Development Environment, supporting KDE/Qt, C/C++ and much more
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=+cmake +cxx debug +gdbui okteta qthelp l10n_bs l10n_ca l10n_ca-valencia l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_fi l10n_fr l10n_gl l10n_hu l10n_it l10n_kk l10n_nb l10n_nds l10n_nl l10n_pl l10n_pt l10n_pt-BR l10n_ru l10n_sk l10n_sl l10n_sv l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 ) okteta? ( >=kde-apps/okteta-4.4:4[aqua=] ) qthelp? ( dev-qt/qthelp:4 ) >=kde-apps/kapptemplate-4.4:4[aqua=] >=kde-apps/kdebase-kioslaves-4.4:4[aqua=] cxx? ( >=sys-devel/gdb-7.0[python] ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.3:4
+RDEPEND=dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 ) okteta? ( >=kde-apps/okteta-4.4:4[aqua=] ) qthelp? ( dev-qt/qthelp:4 ) >=kde-apps/kapptemplate-4.4:4[aqua=] >=kde-apps/kdebase-kioslaves-4.4:4[aqua=] cxx? ( >=sys-devel/gdb-7.0[python] ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.4:4
 RESTRICT=test
 SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.7.3/src/kdevelop-4.7.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7745d7895ed8924cd1c0fe70682c579a
+SRC_URI=mirror://kde/stable/kdevelop/4.7.4/kdevelop-4.7.4.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cbf6a40d8a48ffdd62804026f6ae8b73
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
index 9ccec404a98f..7adfb834b8a8 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/1.0.0/src/kdevelop-pg-qt-1.0.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8cc506f046926d555a4881c016500ce6
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.1.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.1.0
index 801f616daec3..fba8b8f3428c 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-util/kdevelop:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.0.0:4
 SLOT=4
 SRC_URI=https://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=snapshot&h=1.1 -> kdevelop-pg-qt-1.1.0.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8ca84bff94862cebded9bdf685edabed
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.7.2 b/metadata/md5-cache/dev-util/kdevelop-php-1.7.2
index 359648d3a7b4..3d9b9b1edd60 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.7.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/kdevelop:4 doc? ( >=dev-util/kdevelop-php-docs-1.7.2:4 ) kde-fr
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevelop-php-1.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9fdcce0b7a1c717b9149cadf1e759ebc
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-1.7.3 b/metadata/md5-cache/dev-util/kdevelop-php-1.7.4
similarity index 89%
rename from metadata/md5-cache/dev-util/kdevelop-php-1.7.3
rename to metadata/md5-cache/dev-util/kdevelop-php-1.7.4
index 483bd2b97091..e15ca3bca87f 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-1.7.3
+++ b/metadata/md5-cache/dev-util/kdevelop-php-1.7.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0:4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.7.3:4
+DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0:4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.7.4:4
 DESCRIPTION=PHP plugin for KDevelop 4
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=debug doc l10n_bs l10n_ca l10n_ca-valencia l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_fi l10n_fr l10n_gl l10n_it l10n_kk l10n_nl l10n_pl l10n_pt l10n_pt-BR l10n_ru l10n_sk l10n_sl l10n_sv l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-util/kdevelop:4 doc? ( >=dev-util/kdevelop-php-docs-1.7.3:4 ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.7.3:4
+RDEPEND=dev-util/kdevelop:4 doc? ( >=dev-util/kdevelop-php-docs-1.7.4:4 ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.7.4:4
 RESTRICT=test
 SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.7.3/src/kdevelop-php-1.7.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cf90f5ad7a70430b0092d5351e2c2ee8
+SRC_URI=mirror://kde/stable/kdevelop/4.7.4/kdevelop-php-1.7.4.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=68e96c6127ad067940ebf331a863540f
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.2 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.2
index 1ed6942518c4..02b4186a264c 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.2:4
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevelop-php-docs-1.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=283b648fe300fbafaa1cd8e169f21ea7
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.3 b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.4
similarity index 83%
rename from metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.3
rename to metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.4
index b2de1f19fd99..24572840c69b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.3
+++ b/metadata/md5-cache/dev-util/kdevelop-php-docs-1.7.4
@@ -1,13 +1,13 @@
 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.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.3:4
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.4:4
 DESCRIPTION=PHP documentation plugin for KDevelop 4
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=debug aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.3:4
+RDEPEND=!=dev-util/kdevelop-plugins-1.0.0 kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] >=dev-util/kdevplatform-1.7.4:4
 SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.7.3/src/kdevelop-php-docs-1.7.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=35fa4389828d792cd4d78bcb284f7cd7
+SRC_URI=mirror://kde/stable/kdevelop/4.7.4/kdevelop-php-docs-1.7.4.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=fc8e7e26f128199cf2674366bca45196
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-1.7.2 b/metadata/md5-cache/dev-util/kdevelop-python-1.7.2
index a2d4f3994cfd..3db403d271b1 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-1.7.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/kdevelop:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kd
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdev-python-1.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b81856248bf37922e06bb907ef01a4f9
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-1.7.3 b/metadata/md5-cache/dev-util/kdevelop-python-1.7.3
index 6c87635c4865..9942e65ca3b9 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-1.7.3
+++ b/metadata/md5-cache/dev-util/kdevelop-python-1.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/kdevelop:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kd
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.3/src/kdev-python-1.7.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aa4dba472d24f73e614d57053a168ad7
diff --git a/metadata/md5-cache/dev-util/kdevelop-qmake-1.7.0 b/metadata/md5-cache/dev-util/kdevelop-qmake-1.7.0
index 8e2f304d878f..08e6e4d3c9cf 100644
--- a/metadata/md5-cache/dev-util/kdevelop-qmake-1.7.0
+++ b/metadata/md5-cache/dev-util/kdevelop-qmake-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/kdevelop:4 dev-util/kdevelop-pg-qt:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.0.0:4
 SLOT=4
 SRC_URI=https://quickgit.kde.org/?p=kdev-qmake.git&a=snapshot&h=1.7 -> kdevelop-qmake-1.7.0.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1398bffcc22b054c3bc7727be29c3a7
diff --git a/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0 b/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0
index eb93a23fc1bb..e7c1ed8900c0 100644
--- a/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0
+++ b/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-util/kdevplatform-1.7.0:4 dev-util/kdevelop:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] >=dev-util/kdevplatform-1.0.0:4
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/kdev-qmljs/1.7.0/src/kdev-qmljs-1.7.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4961cb815a6bbaf46fda08accad083fe
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1 b/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1
index 461e821f3e45..3d1392f13202 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/grantlee:0 reviewboard? ( dev-libs/qjson ) subversion? ( dev-li
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevplatform-1.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc3800d83b8c6f9a209aade4a5ac02ac
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.7.3 b/metadata/md5-cache/dev-util/kdevplatform-1.7.4
similarity index 92%
rename from metadata/md5-cache/dev-util/kdevplatform-1.7.3
rename to metadata/md5-cache/dev-util/kdevplatform-1.7.4
index 3bd84f770184..1f9ad0b6863c 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-1.7.3
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.7.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/grantlee:0 reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) classbrowser? ( dev-libs/boost ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 DESCRIPTION=KDE development support libraries and apps
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=+classbrowser cvs debug +konsole reviewboard subversion l10n_bs l10n_ca l10n_ca-valencia l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_fi l10n_fr l10n_gl l10n_it l10n_kk l10n_nb l10n_nl l10n_pl l10n_pt l10n_pt-BR l10n_ru l10n_sk l10n_sl l10n_sv l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW test aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/grantlee:0 reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) cvs? ( dev-vcs/cvs ) konsole? ( >=kde-apps/konsolepart-4.4:4[aqua=] ) !<dev-util/kdevelop-4.7.3:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
+RDEPEND=dev-libs/grantlee:0 reviewboard? ( dev-libs/qjson ) subversion? ( dev-libs/apr dev-libs/apr-util dev-vcs/subversion ) cvs? ( dev-vcs/cvs ) konsole? ( >=kde-apps/konsolepart-4.4:4[aqua=] ) !<dev-util/kdevelop-4.7.4:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 RESTRICT=test
 SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.7.3/src/kdevplatform-1.7.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bda7e17a3838ea0e5f2f7b4e44006c21
+SRC_URI=mirror://kde/stable/kdevelop/4.7.4/kdevplatform-1.7.4.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8a31a10d935c6ac80367d14a5c0e3d10
diff --git a/metadata/md5-cache/dev-util/mdds-1.2.2 b/metadata/md5-cache/dev-util/mdds-1.2.2
index bd65b4a80235..3dfe84552d38 100644
--- a/metadata/md5-cache/dev-util/mdds-1.2.2
+++ b/metadata/md5-cache/dev-util/mdds-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/boost:=
 SLOT=1/1.2
 SRC_URI=http://kohei.us/files/mdds/src/mdds-1.2.2.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=863bbc55bffbf9d33adeb1e4c6f83d6f
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=363b6ac653bc0d57415f7a6f42780829
diff --git a/metadata/md5-cache/dev-util/mdds-9999 b/metadata/md5-cache/dev-util/mdds-9999
index 4b86525bb12f..80630cd97a4c 100644
--- a/metadata/md5-cache/dev-util/mdds-9999
+++ b/metadata/md5-cache/dev-util/mdds-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=dev-libs/boost:=
 SLOT=1/9999
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=bc07d1e84c3f71733f75b023a8307c8c
+_md5_=f17329f8dabb5a0e45541ce6b5734e05
diff --git a/metadata/md5-cache/dev-util/qbs-1.7.0 b/metadata/md5-cache/dev-util/qbs-1.7.0
new file mode 100644
index 000000000000..5dc5645cdb80
--- /dev/null
+++ b/metadata/md5-cache/dev-util/qbs-1.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
+DESCRIPTION=Cross-platform build tool
+EAPI=6
+HOMEPAGE=https://wiki.qt.io/Qbs
+IUSE=doc examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
+SLOT=0
+SRC_URI=http://download.qt.io/official_releases/qbs/1.7.0/qbs-src-1.7.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=05ecb82f605cb9f28842d04867b9deaf
diff --git a/metadata/md5-cache/dev-util/scons-2.4.1 b/metadata/md5-cache/dev-util/scons-2.4.1
index 366ccf0667a7..6179dda7268c 100644
--- a/metadata/md5-cache/dev-util/scons-2.4.1
+++ b/metadata/md5-cache/dev-util/scons-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=5
 HOMEPAGE=http://www.scons.org/
 IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-2.4.1.tar.gz doc? ( http://www.scons.org/doc/2.4.1/PDF/scons-user.pdf -> scons-2.4.1-user.pdf http://www.scons.org/doc/2.4.1/HTML/scons-user.html -> scons-2.4.1-user.html )
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6c1c084346c398efe535692af8ce8949
+_md5_=28d07d9c4c51e5497d613bf0f25acf91
diff --git a/metadata/md5-cache/dev-util/strace-4.13 b/metadata/md5-cache/dev-util/strace-4.13
index d57add794a05..e06fb035487f 100644
--- a/metadata/md5-cache/dev-util/strace-4.13
+++ b/metadata/md5-cache/dev-util/strace-4.13
@@ -4,10 +4,10 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/strace/
 IUSE=aio perl static unwind
-KEYWORDS=alpha ~amd64 arm ~arm64 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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.13.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9939824ac0b6492c1d27d369ce6953d3
+_md5_=3daf6a53835939025380d5f2922b0ced
diff --git a/metadata/md5-cache/dev-vcs/git-2.10.2 b/metadata/md5-cache/dev-vcs/git-2.10.2
index b97ea9668795..2f4e5d788095 100644
--- a/metadata/md5-cache/dev-vcs/git-2.10.2
+++ b/metadata/md5-cache/dev-vcs/git-2.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.10.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.10.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.10.2.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2463af1dbb1cc3aff3a50f98f75440fc
+_md5_=b985b80ccb0e0b49b7ef7286d4ecf5ff
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-1.6.0-r1 b/metadata/md5-cache/dev-vcs/kdesvn-1.6.0-r1
index 3f1cf18312e1..7a39580db8c1 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-1.6.0-r1
+++ b/metadata/md5-cache/dev-vcs/kdesvn-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 >=dev-vcs/subversion-1.7 sys-devel/gettext dev-qt/qtsql:4[sqlite] !kde-apps/kdesdk-kioslaves:4[subversion(+)] kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kdesvn.alwins-world.de/downloads/kdesvn-1.6.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5759904865bb8e5935cbd4d099979f76
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-1.7.0 b/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
index c9f96f19aa9a..eebf9789d73a 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-qt/qtsql:4[sqlite] >=dev-vcs/subv
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/kdesvn/1.7.0/kdesvn-1.7.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3d0b560210bdfc9aa41ef26c8a6878d2
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.17 b/metadata/md5-cache/dev-vcs/subversion-1.8.17
index 6ab81238ef0e..3f290e2fc722 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.17
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.17
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-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 ~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=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib app-arch/bzip2 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) http? ( >=net-libs/serf-1.2.1 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.17.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	9750b21d9600b3ebc8dacfb0c2674436	distutils-r1	583a05d30524485fda6869c772682ecd	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ruby-single	a5e86595177a8998cbb9f794f2bf9700	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a2f2bf031ae650e1db4901545ed9620e
+_md5_=babc9053cd04ba2f4689949e5c04da3f
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.5 b/metadata/md5-cache/dev-vcs/subversion-1.9.5
index a9d357af83e5..20c384ce7dcb 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.5
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.5
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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 ~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=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib app-arch/bzip2 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) http? ( >=net-libs/serf-1.3.4 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.5.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	9750b21d9600b3ebc8dacfb0c2674436	distutils-r1	583a05d30524485fda6869c772682ecd	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ruby-single	a5e86595177a8998cbb9f794f2bf9700	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bce43a9f2724ea41eb8e5beb01c726a8
+_md5_=6f4a21a6f4bfcd4b9842f32e28965bf6
diff --git a/metadata/md5-cache/games-board/knights-2.5.0-r1 b/metadata/md5-cache/games-board/knights-2.5.0-r1
index 708b7373541f..ba9609db6cfc 100644
--- a/metadata/md5-cache/games-board/knights-2.5.0-r1
+++ b/metadata/md5-cache/games-board/knights-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-apps/libkdegames-4.9:4[aqua=] kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_it(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_lt(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.9:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.9:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://dl.dropbox.com/u/2888238/Knights/knights-2.5.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=99ea8e0b620ff50fcb5fc885e5436284
diff --git a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3 b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
index 8db0ee5ae805..ab4803adf1d8 100644
--- a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
+++ b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kmuddy.com/releases/stable/kmuddy-1.0.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=445a852ecb4b30601cadf0be5ff0eea4
diff --git a/metadata/md5-cache/games-strategy/warmux-11.04.1-r1 b/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
index 7c467793d5ab..71896ed185be 100644
--- a/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
+++ b/metadata/md5-cache/games-strategy/warmux-11.04.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net >=media-libs/sdl-gfx-2.0.22 net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A free Worms clone
 EAPI=6
 HOMEPAGE=http://gna.org/projects/warmux/
 IUSE=debug nls unicode
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net >=media-libs/sdl-gfx-2.0.22 net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
+RDEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
 SLOT=0
 SRC_URI=http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2a428f778ede340a697c388437b2339a
+_md5_=3200049251f89375a47449845a86af6c
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.22.1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.22.1
index beb25b727a97..64b3ea5ac86a 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.22.1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.22.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( ( >=net-fs/samba-3.6.14-r1[smbclient] <net-fs/samba-4.0.0[smbclient] ) >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( ( >=net-fs/samba-3.6.14-r1[smbclient] <net-fs/samba-4.0.0[smbclient] ) >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=23c40a7f5ae11d0a7f6b5e8f467dcb83
+_md5_=0da22bb4ff3b0c85d9ff368bfa785a12
diff --git a/metadata/md5-cache/kde-apps/akonadi-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-16.08.3
deleted file mode 100644
index b222ffbe3fda..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-16.08.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) tools? ( xml? ( dev-libs/libxml2 ) ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.26.0:5 >=dev-qt/designer-5.6.1:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://pim.kde.org/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) tools? ( xml? ( dev-libs/libxml2 ) ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) !kde-apps/kdepimlibs >=kde-frameworks/kf-env-3 !kde-apps/akonadi:4 >=dev-qt/qtcore-5.6.1:5
-REQUIRED_USE=|| ( sqlite mysql postgres ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07f9092560bd5899a9ae16145a3bacfb
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-16.08.3
deleted file mode 100644
index 059dc97f032c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/akonadi-calendar:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-calendar-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d6da751e8894c9c92037d513c1639748
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-16.08.3
deleted file mode 100644
index 8d25690d1af8..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=prison debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) >=kde-frameworks/kf-env-3 !kde-apps/akonadi-contacts:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-contacts-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=39235bbb86af6afea725cb2f731cd37a
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-16.08.3
deleted file mode 100644
index 2e0e954fefff..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kmail:4 >=kde-frameworks/kf-env-3 !kde-apps/akonadi-import-wizard:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8f096998df4879e27904844f379c1c2e
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-mime-16.08.3
deleted file mode 100644
index 02219590c50c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-3 !kde-apps/akonadi-mime:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-mime-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=616c82dd13e3cca87d335e5d75664fde
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-notes-16.08.3
deleted file mode 100644
index e3ed7c2462c8..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-apps/akonadi-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/akonadi-notes:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-notes-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d5cb9f2be2027017f84bb6124f6fc0e0
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-16.08.3 b/metadata/md5-cache/kde-apps/akonadi-search-16.08.3
deleted file mode 100644
index 3be7da56fa62..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/krunner-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/playground/pim/akonadi-search
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/krunner-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/xapian-1.3:=[chert] >=kde-frameworks/kf-env-3 !kde-apps/akonadi-search:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/akonadi-search-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=826ad0d5ce066a745ac8dcde666516e3
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-16.08.3 b/metadata/md5-cache/kde-apps/akonadiconsole-16.08.3
deleted file mode 100644
index c95af2c698f6..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/akonadiconsole:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c62e92bb8bebd7e1f033ddaabf60d7df
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/akonadiconsole-4.14.11_pre20160211
index d5301bded0c9..e230a06c7bd0 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] kde-apps/akonadi:4 !kde-base/akonadiconsole:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=adfe236fcdc0ebb2d58667df372e7684
diff --git a/metadata/md5-cache/kde-apps/akregator-16.08.3 b/metadata/md5-cache/kde-apps/akregator-16.08.3
deleted file mode 100644
index 80ad0b1ff7d9..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/khtml-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=kde-apps/syndication-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/khtml-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=kde-apps/syndication-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5= >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/akregator:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2a8780a001209fea6afd7a55523f117e
diff --git a/metadata/md5-cache/kde-apps/akregator-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/akregator-4.14.11_pre20160211
index d9375203fc49..57431e2af550 100644
--- a/metadata/md5-cache/kde-apps/akregator-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/akregator-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] !kde-base/akregator:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.14.11_pre20160211:4[aqua=] )
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=92d6a67a97112edfc17489484604c6e7
diff --git a/metadata/md5-cache/kde-apps/akregator-4.4.2016.01 b/metadata/md5-cache/kde-apps/akregator-4.4.2016.01
index 4cb003495445..3a04111307f7 100644
--- a/metadata/md5-cache/kde-apps/akregator-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/akregator-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.6:4[aqua=] >=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/akregator:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=334200a9e6a515a9573d64834911cc20
diff --git a/metadata/md5-cache/kde-apps/attica-16.04.3 b/metadata/md5-cache/kde-apps/attica-16.04.3
index 39990e2f01ab..42ab5cefddfe 100644
--- a/metadata/md5-cache/kde-apps/attica-16.04.3
+++ b/metadata/md5-cache/kde-apps/attica-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libattica !kde-base/attica:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ab5095cd530c272e9ad622178691a56e
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-16.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-16.04.3
index f882f360dac8..3a8a0f158c39 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-16.04.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkcddb-4.14.3:4[aqua=] >=kde-apps/libkcompactdisc-4.14.3:4[aqua=] media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !kde-base/audiocd-kio:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/audiocd-kio-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cb91e37ef673b33d2081955aa6b455b2
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-16.08.3 b/metadata/md5-cache/kde-apps/audiocd-kio-16.08.3
index eafd167e1723..45b4eaa65f55 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-16.08.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkcddb-4.14.3:4[aqua=] >=kde-apps/libkcompactdisc-4.14.3:4[aqua=] media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !kde-base/audiocd-kio:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/audiocd-kio-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4b32dc18bb7560b355ded19715527609
diff --git a/metadata/md5-cache/kde-apps/blogilo-16.08.3 b/metadata/md5-cache/kde-apps/blogilo-16.08.3
deleted file mode 100644
index cab5bcf3b908..000000000000
--- a/metadata/md5-cache/kde-apps/blogilo-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kblog-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 google? ( net-libs/libkgapi:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to create, edit and update blog content
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/blogilo
-IUSE=google debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kblog-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 google? ( net-libs/libkgapi:5 ) !<kde-apps/kdepim-apps-libs-16.04.50 >=kde-frameworks/kf-env-3 !kde-apps/blogilo:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fd77796edbf25dab0053413d87863df6
diff --git a/metadata/md5-cache/kde-apps/blogilo-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/blogilo-4.14.11_pre20160211
index 82f4e5901a6d..55f6a44a8f8d 100644
--- a/metadata/md5-cache/kde-apps/blogilo-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/blogilo-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] >=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=net-libs/libkgapi-2.2.0:4 !kde-base/blogilo:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9327660f17dc84256edc3e8a610505ca
diff --git a/metadata/md5-cache/kde-apps/blogilo-4.4.2016.01 b/metadata/md5-cache/kde-apps/blogilo-4.4.2016.01
index ba8749e17b7b..842b695efe3b 100644
--- a/metadata/md5-cache/kde-apps/blogilo-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/blogilo-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] !kde-misc/bilbo !kde-misc/blogilo !kde-base/blogilo:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e88d8f15e8593189cd920a4b0261308a
diff --git a/metadata/md5-cache/kde-apps/bomber-16.08.3 b/metadata/md5-cache/kde-apps/bomber-16.08.3
index cdfa495619aa..7e27bd55ad62 100644
--- a/metadata/md5-cache/kde-apps/bomber-16.08.3
+++ b/metadata/md5-cache/kde-apps/bomber-16.08.3
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/applications/games/bomber/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/libkdegames-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/libkdegames-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !games-action/xbomber >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/bomber-16.08.3.tar.xz
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=799c88c9e95e7ef00a3fd2e69101e254
+_md5_=a3e836b83503baf6f7599465d2a4006b
diff --git a/metadata/md5-cache/kde-apps/bomber-16.12.0 b/metadata/md5-cache/kde-apps/bomber-16.12.0
index a32f3105d19d..840444e33ed6 100644
--- a/metadata/md5-cache/kde-apps/bomber-16.12.0
+++ b/metadata/md5-cache/kde-apps/bomber-16.12.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/applications/games/bomber/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/kcrash-5.28.0:5 >=kde-frameworks/kdbusaddons-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=kde-apps/libkdegames-16.12.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/kcrash-5.28.0:5 >=kde-frameworks/kdbusaddons-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=kde-apps/libkdegames-16.12.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !games-action/xbomber >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/bomber-16.12.0.tar.xz
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=799c88c9e95e7ef00a3fd2e69101e254
+_md5_=a3e836b83503baf6f7599465d2a4006b
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-16.08.3 b/metadata/md5-cache/kde-apps/calendarjanitor-16.08.3
deleted file mode 100644
index 9a219e033f7e..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim:5 >=kde-frameworks/kf-env-3 !kde-apps/calendarjanitor:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b83bbce2a3f7e9a1a80185525b87502f
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/calendarjanitor-4.14.11_pre20160211
index a1c51b40798d..b80507db213e 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] >=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] !kde-base/calendarjanitor:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa3e67fa73e0698cfb36819c57cb66c8
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-16.08.3 b/metadata/md5-cache/kde-apps/calendarsupport-16.08.3
deleted file mode 100644
index 2ffe2ede6b9f..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libical >=kde-frameworks/kf-env-3 !kde-apps/calendarsupport:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/calendarsupport-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7fea53e26cd4b25a8ca2a197a1cd2258
diff --git a/metadata/md5-cache/kde-apps/cervisia-16.04.3 b/metadata/md5-cache/kde-apps/cervisia-16.04.3
index ce7d24c49c5a..0ab6db8c03df 100644
--- a/metadata/md5-cache/kde-apps/cervisia-16.04.3
+++ b/metadata/md5-cache/kde-apps/cervisia-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/cvs !kde-base/cervisia:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/cervisia-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6d4929c4f60f7cd63a42eebe94f5810c
diff --git a/metadata/md5-cache/kde-apps/drkonqi-16.04.3 b/metadata/md5-cache/kde-apps/drkonqi-16.04.3
index 2e1d915702e9..32cb7b75f082 100644
--- a/metadata/md5-cache/kde-apps/drkonqi-16.04.3
+++ b/metadata/md5-cache/kde-apps/drkonqi-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] !kde-base/drkonqi:4 kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=232b4df227fe20f3c5e88eb155a25109
diff --git a/metadata/md5-cache/kde-apps/eventviews-16.08.3 b/metadata/md5-cache/kde-apps/eventviews-16.08.3
deleted file mode 100644
index 2cd73d9f559e..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdgantt2-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdgantt2-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libical >=kde-frameworks/kf-env-3 !kde-apps/eventviews:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/eventviews-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a10ff9523750f1935d77fcfc1ac81392
diff --git a/metadata/md5-cache/kde-apps/gpgmepp-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/gpgmepp-4.14.11_pre20160211
index 8776dcdb87ec..adb367e6c167 100644
--- a/metadata/md5-cache/kde-apps/gpgmepp-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/gpgmepp-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error !kde-apps/kdepimlibs:4 !kde-base/gpgmepp:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=a791b69599c3571ff2f4b1cc9033d8fb30f1bc33&fmt=tgz -> kdepimlibs-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=da9990d92c06a1b0c4bd76ad50786079
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-16.08.3 b/metadata/md5-cache/kde-apps/grantlee-editor-16.08.3
deleted file mode 100644
index b73056717522..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/kblog-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/kblog-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kmail:4 >=kde-frameworks/kf-env-3 !kde-apps/grantlee-editor:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=02437c41e1d7fcb1c152c977eacffa16
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-16.08.3 b/metadata/md5-cache/kde-apps/grantleetheme-16.08.3
deleted file mode 100644
index acb15f051656..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-3 !kde-apps/grantleetheme:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/grantleetheme-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d57ae66f54e8153ea8ea56a1d3f1e7a7
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-16.08.3 b/metadata/md5-cache/kde-apps/incidenceeditor-16.08.3
deleted file mode 100644
index 9c6815ad31c7..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kdgantt2-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kdgantt2-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/incidenceeditor:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/incidenceeditor-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bf141ae2453181137ba44978f0636c03
diff --git a/metadata/md5-cache/kde-apps/jovie-16.04.3 b/metadata/md5-cache/kde-apps/jovie-16.04.3
index 1cbfe83362c8..2b550f28d501 100644
--- a/metadata/md5-cache/kde-apps/jovie-16.04.3
+++ b/metadata/md5-cache/kde-apps/jovie-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher !kde-base/jovie:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/jovie-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eb47ce941b5deb6fe146ab0068c60ad5
diff --git a/metadata/md5-cache/kde-apps/jovie-16.08.3 b/metadata/md5-cache/kde-apps/jovie-16.08.3
index 2ed4299637f3..3bca98c3a513 100644
--- a/metadata/md5-cache/kde-apps/jovie-16.08.3
+++ b/metadata/md5-cache/kde-apps/jovie-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher !kde-base/jovie:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/jovie-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b53b1d48e8688896d524fda8e378fa96
diff --git a/metadata/md5-cache/kde-apps/jovie-16.12.0 b/metadata/md5-cache/kde-apps/jovie-16.12.0
index 11fb7a01dd62..ee49be68e278 100644
--- a/metadata/md5-cache/kde-apps/jovie-16.12.0
+++ b/metadata/md5-cache/kde-apps/jovie-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher !kde-base/jovie:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/jovie-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b53b1d48e8688896d524fda8e378fa96
diff --git a/metadata/md5-cache/kde-apps/juk-16.04.3 b/metadata/md5-cache/kde-apps/juk-16.04.3
index 013df389f3e8..bb7aec36ab41 100644
--- a/metadata/md5-cache/kde-apps/juk-16.04.3
+++ b/metadata/md5-cache/kde-apps/juk-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.6 !kde-base/juk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/juk-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=697845d62060c34da8a1002b8e9c3e4a
diff --git a/metadata/md5-cache/kde-apps/juk-16.08.3 b/metadata/md5-cache/kde-apps/juk-16.08.3
index f59c1dfcc503..3eb7dbae16c2 100644
--- a/metadata/md5-cache/kde-apps/juk-16.08.3
+++ b/metadata/md5-cache/kde-apps/juk-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=media-libs/taglib-1.6 !kde-base/juk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/juk-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d99d518e9fbe1ff2f7b783c5265b4974
diff --git a/metadata/md5-cache/kde-apps/juk-16.12.0 b/metadata/md5-cache/kde-apps/juk-16.12.0
index 6944664c3c00..44230e457ea3 100644
--- a/metadata/md5-cache/kde-apps/juk-16.12.0
+++ b/metadata/md5-cache/kde-apps/juk-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=media-libs/taglib-1.6 !kde-base/juk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/juk-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d99d518e9fbe1ff2f7b783c5265b4974
diff --git a/metadata/md5-cache/kde-apps/kabcclient-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kabcclient-4.14.11_pre20160211
index 881d053175b8..7150150acca8 100644
--- a/metadata/md5-cache/kde-apps/kabcclient-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kabcclient-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] !kde-base/kabcclient:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d1a36c19462306f498871a2bb33aa73b
diff --git a/metadata/md5-cache/kde-apps/kabcclient-4.4.2016.01 b/metadata/md5-cache/kde-apps/kabcclient-4.4.2016.01
index 962086fbe7e9..3e56eaa7e51a 100644
--- a/metadata/md5-cache/kde-apps/kabcclient-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kabcclient-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] !kde-base/kabcclient:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ec655ffeacdf0c26548f1f7f43db8f9
diff --git a/metadata/md5-cache/kde-apps/kaccessible-16.04.3 b/metadata/md5-cache/kde-apps/kaccessible-16.04.3
index e2077351f40a..0419eee28314 100644
--- a/metadata/md5-cache/kde-apps/kaccessible-16.04.3
+++ b/metadata/md5-cache/kde-apps/kaccessible-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) !kde-base/kaccessible:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kaccessible-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a9fd2517701fb531ec204e79a4b4bcc5
diff --git a/metadata/md5-cache/kde-apps/kaccessible-16.08.3 b/metadata/md5-cache/kde-apps/kaccessible-16.08.3
index b47355cc94b0..27d9cdb10743 100644
--- a/metadata/md5-cache/kde-apps/kaccessible-16.08.3
+++ b/metadata/md5-cache/kde-apps/kaccessible-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) !kde-base/kaccessible:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kaccessible-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=778bd1d70b3f768130d0b4313dddb6f3
diff --git a/metadata/md5-cache/kde-apps/kaccessible-16.12.0 b/metadata/md5-cache/kde-apps/kaccessible-16.12.0
index 892844fbc71a..d6379dc72cc2 100644
--- a/metadata/md5-cache/kde-apps/kaccessible-16.12.0
+++ b/metadata/md5-cache/kde-apps/kaccessible-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) !kde-base/kaccessible:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kaccessible-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=778bd1d70b3f768130d0b4313dddb6f3
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-16.08.3 b/metadata/md5-cache/kde-apps/kaddressbook-16.08.3
deleted file mode 100644
index 373a769010b9..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) test? ( >=kde-apps/akonadi-16.08.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=prison test debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) >=kde-apps/kdepim-runtime-16.08.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kaddressbook:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=acb38cbb9a36d3ff898516780601d851
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kaddressbook-4.14.11_pre20160211
index 3e8cc686f36d..b466d00d05c3 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kaddressbook-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] dev-libs/grantlee:0 !kde-base/contactthemeeditor !kde-base/kaddressbook:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.14.11_pre20160211:4[aqua=] )
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ad76c7fc59524a5b99dcd5d8aebc72cb
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-4.4.2016.01 b/metadata/md5-cache/kde-apps/kaddressbook-4.4.2016.01
index 7dd5497d18ed..17c8e6e9ce79 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kaddressbook-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.13.1:4[aqua=] >=kde-apps/kdepimlibs-4.13.1:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] >=kde-apps/libkleo-4.4.2015:4[aqua=] !kde-base/kaddressbook:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c911fe169810820cd6f997ecbff33026
diff --git a/metadata/md5-cache/kde-apps/kajongg-16.04.3 b/metadata/md5-cache/kde-apps/kajongg-16.04.3
index fb93fc1c2884..5cc9337d1259 100644
--- a/metadata/md5-cache/kde-apps/kajongg-16.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kajongg-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4ac4953c61fe04850a733ce6db5e880b
diff --git a/metadata/md5-cache/kde-apps/kajongg-16.08.3 b/metadata/md5-cache/kde-apps/kajongg-16.08.3
index 0bac718e0928..2cd0dcb8cf74 100644
--- a/metadata/md5-cache/kde-apps/kajongg-16.08.3
+++ b/metadata/md5-cache/kde-apps/kajongg-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kajongg-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=60f2c6da3e3403cb110f3a65d109bd90
diff --git a/metadata/md5-cache/kde-apps/kajongg-16.12.0 b/metadata/md5-cache/kde-apps/kajongg-16.12.0
index 441089d43850..f2f87d553f7c 100644
--- a/metadata/md5-cache/kde-apps/kajongg-16.12.0
+++ b/metadata/md5-cache/kde-apps/kajongg-16.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kajongg-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=60f2c6da3e3403cb110f3a65d109bd90
diff --git a/metadata/md5-cache/kde-apps/kalarm-16.08.3 b/metadata/md5-cache/kde-apps/kalarm-16.08.3
deleted file mode 100644
index c4845d036241..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxslt media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/libxslt media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) !kde-apps/kdepim:5 >=kde-frameworks/kf-env-3 !kde-apps/kalarm:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d31b04e1e44819154577e4eabc355fb8
diff --git a/metadata/md5-cache/kde-apps/kalarm-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kalarm-4.14.11_pre20160211
index abcd693566b2..8e57265c9f46 100644
--- a/metadata/md5-cache/kde-apps/kalarm-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kalarm-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] media-libs/phonon[qt4] x11-libs/libX11 !kde-base/kalarm:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e58e0eabeb03c7b3d912645a03b7302
diff --git a/metadata/md5-cache/kde-apps/kalarm-4.4.2016.01 b/metadata/md5-cache/kde-apps/kalarm-4.4.2016.01
index 16711108cc99..08110bb615e4 100644
--- a/metadata/md5-cache/kde-apps/kalarm-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kalarm-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/kalarm:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa79a034f1463a0776bd3dd0066729c4
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-16.08.3 b/metadata/md5-cache/kde-apps/kalarmcal-16.08.3
deleted file mode 100644
index bbf93bdeb2f3..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kalarmcal:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kalarmcal-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=80286837daf582c6380fab3c5cdeefe7
diff --git a/metadata/md5-cache/kde-apps/kalzium-16.04.3 b/metadata/md5-cache/kde-apps/kalzium-16.04.3
index 83a2964c9ae8..ca584ea88e63 100644
--- a/metadata/md5-cache/kde-apps/kalzium-16.04.3
+++ b/metadata/md5-cache/kde-apps/kalzium-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=editor? ( dev-cpp/eigen:3 sci-chemistry/avogadro >=sci-chemistry/openbabel-2.2 dev-qt/qtopengl:4 ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data !kde-base/kalzium:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kalzium-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5ef594d5a5eb8a0de772adbbe8797446
diff --git a/metadata/md5-cache/kde-apps/kalzium-16.08.3 b/metadata/md5-cache/kde-apps/kalzium-16.08.3
index d858764259f4..eb6a9884eb00 100644
--- a/metadata/md5-cache/kde-apps/kalzium-16.08.3
+++ b/metadata/md5-cache/kde-apps/kalzium-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=editor? ( dev-cpp/eigen:3 sci-chemistry/avogadro >=sci-chemistry/openbabel-2.2 dev-qt/qtopengl:4 ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data !kde-base/kalzium:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kalzium-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=12dabb6e37d708eb1579764561884aa3
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-4.14.3 b/metadata/md5-cache/kde-apps/kapptemplate-4.14.3
index ae13800a2826..af448de89c29 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-4.14.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kapptemplate:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kapptemplate-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=33448c523f42c9a1826f0cc49d8d4544
diff --git a/metadata/md5-cache/kde-apps/kblog-16.08.3 b/metadata/md5-cache/kde-apps/kblog-16.08.3
deleted file mode 100644
index d30fb391d981..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kxmlrpcclient-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/syndication-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kxmlrpcclient-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/syndication-16.08.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kblog:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kblog-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d0b275c26d6413f0408848c574f55e14
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-16.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-16.04.3
index b13705ce4c3f..de2579d1f269 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-16.04.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz !kde-base/kcachegrind:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kcachegrind-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49287791836882d28188a5b742cfd845
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-16.08.3 b/metadata/md5-cache/kde-apps/kcachegrind-16.08.3
index 32d3f2390a78..13bcb82c9ede 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-16.08.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz !kde-base/kcachegrind:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kcachegrind-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=04a4eff6fca9ee853fce3a049edb4910
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-16.12.0 b/metadata/md5-cache/kde-apps/kcachegrind-16.12.0
index 0575f92d8fec..4b3f37255046 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-16.12.0
+++ b/metadata/md5-cache/kde-apps/kcachegrind-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/graphviz !kde-base/kcachegrind:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kcachegrind-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c752575f735e060938765cb4678dbc3c
diff --git a/metadata/md5-cache/kde-apps/kcalutils-16.08.3 b/metadata/md5-cache/kde-apps/kcalutils-16.08.3
deleted file mode 100644
index 933fb7e7e790..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-3 !kde-apps/kcalutils:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kcalutils-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e984a52aa11cf62550fe52f853a13b7b
diff --git a/metadata/md5-cache/kde-apps/kcmshell-16.04.3 b/metadata/md5-cache/kde-apps/kcmshell-16.04.3
index 98fde76d7752..560a853c1a2f 100644
--- a/metadata/md5-cache/kde-apps/kcmshell-16.04.3
+++ b/metadata/md5-cache/kde-apps/kcmshell-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kcmshell:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f3f8bfe96c96a29296cc8ddb828861d
diff --git a/metadata/md5-cache/kde-apps/kcontacts-16.08.3 b/metadata/md5-cache/kde-apps/kcontacts-16.08.3
deleted file mode 100644
index e61089fb9f0a..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kcontacts:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kcontacts-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7f9953c9b217f7b4f90960f0a06582a1
diff --git a/metadata/md5-cache/kde-apps/kcontrol-16.04.3 b/metadata/md5-cache/kde-apps/kcontrol-16.04.3
index c111ef60131d..6e8931cd2b92 100644
--- a/metadata/md5-cache/kde-apps/kcontrol-16.04.3
+++ b/metadata/md5-cache/kde-apps/kcontrol-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/zeroconf-ioslave-4.14.3:4[aqua=] || ( kde-plasma/khotkeys:4 kde-plasma/khotkeys:5 ) !kde-base/kcontrol:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=710653e4761708a7840ff66697334737
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-16.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-16.04.3
index dc0c9e75c492..e81ff7006bda 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-16.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kde-dev-utils:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-dev-utils-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4438d8b5174b1a8f42f29b67ba0c7f8
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-16.08.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-16.08.3
index ed22babcc6e5..b3c812b4f33f 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-16.08.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kde-dev-utils:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-dev-utils-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6d6702927d495bffa213d9ed399f49c9
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-16.12.0 b/metadata/md5-cache/kde-apps/kde-dev-utils-16.12.0
index 5564b767492c..a4aee50e91d7 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-16.12.0
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kde-dev-utils:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kde-dev-utils-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6d6702927d495bffa213d9ed399f49c9
diff --git a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
index 8d5ddc0a60b8..a003aa58f008 100644
--- a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/hicolor-icon-theme !kde-base/kdebase-data:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a2562613edfbceb96ac5318cb233266
diff --git a/metadata/md5-cache/kde-apps/kdebase-desktoptheme-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-desktoptheme-16.04.3
index 01c1dcce8305..9002e18e4f4a 100644
--- a/metadata/md5-cache/kde-apps/kdebase-desktoptheme-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-desktoptheme-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-desktoptheme:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2326da1cc3edc4acef3f43b8ee28bc36
diff --git a/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2 b/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
index b14e7f2c64c8..8893cde75cb9 100644
--- a/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
+++ b/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg:0 !aqua? ( x11-libs/libXcursor ) bzip2? ( app-arch/bzip2 )
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7b3c3749a3e1c08b3e7a2e9c33bbb2b6
diff --git a/metadata/md5-cache/kde-apps/kdebase-menu-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-menu-16.04.3
index faade9a99562..1486460c1625 100644
--- a/metadata/md5-cache/kde-apps/kdebase-menu-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-menu-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-menu:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4042392257dbe189f5982e7583cc384d
diff --git a/metadata/md5-cache/kde-apps/kdebase-menu-icons-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-menu-icons-16.04.3
index 892efcdfe68b..88fb2a9750a9 100644
--- a/metadata/md5-cache/kde-apps/kdebase-menu-icons-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-menu-icons-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebase-menu-icons:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1dd7fcd0c0283b27c51d8d993846d4e3
diff --git a/metadata/md5-cache/kde-apps/kdebugdialog-16.04.3 b/metadata/md5-cache/kde-apps/kdebugdialog-16.04.3
index 358f9a662282..ee2770dda1ed 100644
--- a/metadata/md5-cache/kde-apps/kdebugdialog-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebugdialog-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdebugdialog:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=871fe790afea53869b7a36b531770854
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.04.3
index 8a35a6dbb089..a1947c44ae41 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdegraphics-mobipocket:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdegraphics-mobipocket-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=841fea9d2c42d6f37f0981c507b0b409
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.08.3
index ade0de187c35..06800270b7b1 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdegraphics-mobipocket:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdegraphics-mobipocket-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26809429a89fb3e73e09634afa814a55
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.0 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.0
index 869f004e99c1..4bd94fe9a35c 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.0
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-16.12.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+thumbnail debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.6.1:5 thumbnail? ( >=kde-frameworks/kio-5.28.0:5 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=dev-qt/qtgui-5.6.1:5 thumbnail? ( >=kde-frameworks/kio-5.28.0:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kdegraphics-mobipocket:4 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kdegraphics-mobipocket-16.12.0.tar.xz
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6cd0c472ad40f3c07d1c22a31761cd64
+_md5_=ef30c8c13075f339e340e5d934f88c84
diff --git a/metadata/md5-cache/kde-apps/kdepasswd-16.04.3 b/metadata/md5-cache/kde-apps/kdepasswd-16.04.3
index 4b944a974893..e3a80f382c12 100644
--- a/metadata/md5-cache/kde-apps/kdepasswd-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdepasswd-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] >=kde-apps/kdesu-4.14.3:4[aqua=] sys-apps/accountsservice !kde-base/kdepasswd:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4cff579bcaaf506199be6e55e31a18af
diff --git a/metadata/md5-cache/kde-apps/kdepasswd-16.08.3 b/metadata/md5-cache/kde-apps/kdepasswd-16.08.3
index f2ca6ba03c9d..0fb718e4dddd 100644
--- a/metadata/md5-cache/kde-apps/kdepasswd-16.08.3
+++ b/metadata/md5-cache/kde-apps/kdepasswd-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] >=kde-apps/kdesu-4.14.3:4[aqua=] sys-apps/accountsservice !kde-base/kdepasswd:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0c8e1c2b0aed7c4f11c795286a194b63
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-16.08.3 b/metadata/md5-cache/kde-apps/kdepim-addons-16.08.3
deleted file mode 100644
index b1ab2e4ee515..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/khtml-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/libktnef-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 google? ( net-libs/libkgapi:5 ) >=kde-apps/gpgmepp-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=google test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/khtml-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/libktnef-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 google? ( net-libs/libkgapi:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim !kde-apps/kmail:4 >=kde-frameworks/kf-env-3 !kde-apps/kdepim-addons:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-addons-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b722505bdaddb7f9e130cc2b1466f1ab
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-16.08.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-16.08.3
deleted file mode 100644
index dae447393600..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=prison test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.26.0:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kdepim-apps-libs:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-apps-libs-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b89a73f67017dac162d8905ae52c59a8
diff --git a/metadata/md5-cache/kde-apps/kdepim-common-libs-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kdepim-common-libs-4.14.11_pre20160211
index 6fd1228e0d50..d8f772ff1430 100644
--- a/metadata/md5-cache/kde-apps/kdepim-common-libs-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kdepim-common-libs-4.14.11_pre20160211
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] app-crypt/
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6505cf7d89cecd1578e1a5091abc21fa
diff --git a/metadata/md5-cache/kde-apps/kdepim-kresources-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kdepim-kresources-4.14.11_pre20160211
index e50cbe78299c..72a6c784888c 100644
--- a/metadata/md5-cache/kde-apps/kdepim-kresources-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kdepim-kresources-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] !kde-base/kdepim-kresources:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5bd964f8ec1ec97bb8f7d7853cbd9f78
diff --git a/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2016.01 b/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2016.01
index c35974e775c3..6e64892446d3 100644
--- a/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] >=kde-apps/kaddressbook-4.4.2015:4[aqua=] !kde-base/kdepim-kresources:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=933683305a39de3cd44ab6eee3c1ff7c
diff --git a/metadata/md5-cache/kde-apps/kdepim-l10n-4.14.3-r1 b/metadata/md5-cache/kde-apps/kdepim-l10n-4.14.3-r1
index 8338586211c4..e8ade6e31faa 100644
--- a/metadata/md5-cache/kde-apps/kdepim-l10n-4.14.3-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-l10n-4.14.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !<kde-apps/kde4-l10n-4.14.3-r1 !kde-base/kdepim-l10n:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=l10n_ar? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ar-4.14.3.tar.xz ) l10n_bg? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-bg-4.14.3.tar.xz ) l10n_bs? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-bs-4.14.3.tar.xz ) l10n_ca? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ca-4.14.3.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ca@valencia-4.14.3.tar.xz ) l10n_cs? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-cs-4.14.3.tar.xz ) l10n_da? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-da-4.14.3.tar.xz ) l10n_de? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-de-4.14.3.tar.xz ) l10n_el? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-el-4.14.3.tar.xz ) l10n_en-GB? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-en_GB-4.14.3.tar.xz ) l10n_es? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-es-4.14.3.tar.xz ) l10n_et? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-et-4.14.3.tar.xz ) l10n_eu? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-eu-4.14.3.tar.xz ) l10n_fa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fa-4.14.3.tar.xz ) l10n_fi? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fi-4.14.3.tar.xz ) l10n_fr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fr-4.14.3.tar.xz ) l10n_ga? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ga-4.14.3.tar.xz ) l10n_gl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-gl-4.14.3.tar.xz ) l10n_he? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-he-4.14.3.tar.xz ) l10n_hi? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hi-4.14.3.tar.xz ) l10n_hr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hr-4.14.3.tar.xz ) l10n_hu? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hu-4.14.3.tar.xz ) l10n_ia? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ia-4.14.3.tar.xz ) l10n_id? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-id-4.14.3.tar.xz ) l10n_is? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-is-4.14.3.tar.xz ) l10n_it? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-it-4.14.3.tar.xz ) l10n_ja? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ja-4.14.3.tar.xz ) l10n_kk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-kk-4.14.3.tar.xz ) l10n_km? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-km-4.14.3.tar.xz ) l10n_ko? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ko-4.14.3.tar.xz ) l10n_lt? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-lt-4.14.3.tar.xz ) l10n_lv? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-lv-4.14.3.tar.xz ) l10n_mr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-mr-4.14.3.tar.xz ) l10n_nb? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nb-4.14.3.tar.xz ) l10n_nds? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nds-4.14.3.tar.xz ) l10n_nl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nl-4.14.3.tar.xz ) l10n_nn? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nn-4.14.3.tar.xz ) l10n_pa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pa-4.14.3.tar.xz ) l10n_pl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pl-4.14.3.tar.xz ) l10n_pt? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pt-4.14.3.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pt_BR-4.14.3.tar.xz ) l10n_ro? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ro-4.14.3.tar.xz ) l10n_ru? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ru-4.14.3.tar.xz ) l10n_sk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sk-4.14.3.tar.xz ) l10n_sl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sl-4.14.3.tar.xz ) l10n_sr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sr-4.14.3.tar.xz ) l10n_sv? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sv-4.14.3.tar.xz ) l10n_tr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-tr-4.14.3.tar.xz ) l10n_ug? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ug-4.14.3.tar.xz ) l10n_uk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-uk-4.14.3.tar.xz ) l10n_wa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-wa-4.14.3.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-zh_CN-4.14.3.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-zh_TW-4.14.3.tar.xz )
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=02400ee865d4782d1c440e2944d9aa82
diff --git a/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2 b/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
index f9953514a724..886e72a590b8 100644
--- a/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
+++ b/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !<kde-apps/kde4-l10n-4.14.3-r1 !kde-base/kdepim-l10n:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=l10n_ar? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ar-4.4.5.tar.bz2 ) l10n_bg? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-bg-4.4.5.tar.bz2 ) l10n_ca? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ca-4.4.5.tar.bz2 ) l10n_ca-valencia? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ca@valencia-4.4.5.tar.bz2 ) l10n_cs? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-cs-4.4.5.tar.bz2 ) l10n_csb? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-csb-4.4.5.tar.bz2 ) l10n_da? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-da-4.4.5.tar.bz2 ) l10n_de? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-de-4.4.5.tar.bz2 ) l10n_el? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-el-4.4.5.tar.bz2 ) l10n_en-GB? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-en_GB-4.4.5.tar.bz2 ) l10n_eo? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-eo-4.4.5.tar.bz2 ) l10n_es? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-es-4.4.5.tar.bz2 ) l10n_et? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-et-4.4.5.tar.bz2 ) l10n_eu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-eu-4.4.5.tar.bz2 ) l10n_fi? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fi-4.4.5.tar.bz2 ) l10n_fr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fr-4.4.5.tar.bz2 ) l10n_fy? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fy-4.4.5.tar.bz2 ) l10n_ga? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ga-4.4.5.tar.bz2 ) l10n_gl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-gl-4.4.5.tar.bz2 ) l10n_gu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-gu-4.4.5.tar.bz2 ) l10n_he? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-he-4.4.5.tar.bz2 ) l10n_hi? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hi-4.4.5.tar.bz2 ) l10n_hr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hr-4.4.5.tar.bz2 ) l10n_hu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hu-4.4.5.tar.bz2 ) l10n_id? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-id-4.4.5.tar.bz2 ) l10n_is? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-is-4.4.5.tar.bz2 ) l10n_it? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-it-4.4.5.tar.bz2 ) l10n_ja? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ja-4.4.5.tar.bz2 ) l10n_kk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-kk-4.4.5.tar.bz2 ) l10n_km? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-km-4.4.5.tar.bz2 ) l10n_kn? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-kn-4.4.5.tar.bz2 ) l10n_ko? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ko-4.4.5.tar.bz2 ) l10n_lt? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-lt-4.4.5.tar.bz2 ) l10n_lv? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-lv-4.4.5.tar.bz2 ) l10n_mai? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-mai-4.4.5.tar.bz2 ) l10n_mk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-mk-4.4.5.tar.bz2 ) l10n_ml? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ml-4.4.5.tar.bz2 ) l10n_nb? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nb-4.4.5.tar.bz2 ) l10n_nds? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nds-4.4.5.tar.bz2 ) l10n_nl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nl-4.4.5.tar.bz2 ) l10n_nn? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nn-4.4.5.tar.bz2 ) l10n_pa? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pa-4.4.5.tar.bz2 ) l10n_pl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pl-4.4.5.tar.bz2 ) l10n_pt? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pt-4.4.5.tar.bz2 ) l10n_pt-BR? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pt_BR-4.4.5.tar.bz2 ) l10n_ro? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ro-4.4.5.tar.bz2 ) l10n_ru? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ru-4.4.5.tar.bz2 ) l10n_si? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-si-4.4.5.tar.bz2 ) l10n_sk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sk-4.4.5.tar.bz2 ) l10n_sl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sl-4.4.5.tar.bz2 ) l10n_sr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sr-4.4.5.tar.bz2 ) l10n_sv? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sv-4.4.5.tar.bz2 ) l10n_tg? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-tg-4.4.5.tar.bz2 ) l10n_tr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-tr-4.4.5.tar.bz2 ) l10n_uk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-uk-4.4.5.tar.bz2 ) l10n_wa? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-wa-4.4.5.tar.bz2 ) l10n_zh-CN? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-zh_CN-4.4.5.tar.bz2 ) l10n_zh-TW? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-zh_TW-4.4.5.tar.bz2 )
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a2852238f64d5926c44c8d6b825bbb18
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-16.08.3 b/metadata/md5-cache/kde-apps/kdepim-meta-16.08.3
deleted file mode 100644
index d1055e25fe26..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-16.08.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=nls
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-16.08.3 >=kde-apps/akonadiconsole-16.08.3 >=kde-apps/akonadi-calendar-16.08.3 >=kde-apps/akonadi-contacts-16.08.3 >=kde-apps/akonadi-import-wizard-16.08.3 >=kde-apps/akonadi-mime-16.08.3 >=kde-apps/akonadi-notes-16.08.3 >=kde-apps/akonadi-search-16.08.3 >=kde-apps/akregator-16.08.3 >=kde-apps/blogilo-16.08.3 >=kde-apps/calendarjanitor-16.08.3 >=kde-apps/calendarsupport-16.08.3 >=kde-apps/eventviews-16.08.3 >=kde-apps/gpgmepp-16.08.3 >=kde-apps/grantlee-editor-16.08.3 >=kde-apps/grantleetheme-16.08.3 >=kde-apps/incidenceeditor-16.08.3 >=kde-apps/kaddressbook-16.08.3 >=kde-apps/kalarm-16.08.3 >=kde-apps/kalarmcal-16.08.3 >=kde-apps/kblog-16.08.3 >=kde-apps/kcalcore-16.08.3 >=kde-apps/kcalutils-16.08.3 >=kde-apps/kcontacts-16.08.3 >=kde-apps/kdepim-addons-16.08.3 >=kde-apps/kdepim-apps-libs-16.08.3 >=kde-apps/kdepim-runtime-16.08.3 >=kde-apps/kdgantt2-16.08.3 >=kde-apps/kholidays-16.08.3 >=kde-apps/kidentitymanagement-16.08.3 >=kde-apps/kimap-16.08.3 >=kde-apps/kldap-16.08.3 >=kde-apps/kleopatra-16.08.3 >=kde-apps/kmail-16.08.3 >=kde-apps/kmail-account-wizard-16.08.3 >=kde-apps/kmailtransport-16.08.3 >=kde-apps/kmbox-16.08.3 >=kde-apps/kmime-16.08.3 >=kde-apps/knotes-16.08.3 >=kde-apps/konsolekalendar-16.08.3 >=kde-apps/kontact-16.08.3 >=kde-apps/kontactinterface-16.08.3 >=kde-apps/korganizer-16.08.3 >=kde-apps/kpimtextedit-16.08.3 >=kde-apps/ktnef-16.08.3 >=kde-apps/libgravatar-16.08.3 >=kde-apps/libkdepim-16.08.3 >=kde-apps/libkleo-16.08.3 >=kde-apps/libksieve-16.08.3 >=kde-apps/libktnef-16.08.3 >=kde-apps/mailcommon-16.08.3 >=kde-apps/mailimporter-16.08.3 >=kde-apps/mbox-importer-16.08.3 >=kde-apps/messagelib-16.08.3 >=kde-apps/pim-data-exporter-16.08.3 >=kde-apps/pim-sieve-editor-16.08.3 >=kde-apps/pim-storage-service-manager-16.08.3 >=kde-apps/pimcommon-16.08.3 >=kde-apps/syndication-16.08.3 nls? ( >=kde-apps/kdepim-l10n-16.08.3 )
-SLOT=5
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kde5-functions	e944f934c4768113a108eb0184031467	kde5-meta-pkg	c95f4a5ee487f170647a3b1bac69ce7d	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca3d3aa080c413441986b088dc2fdf20
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-16.08.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-16.08.3
deleted file mode 100644
index 55366e90c522..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kimap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmbox-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 dev-libs/libical:= google? ( >=net-libs/libkgapi-5.1.0:5 ) ssl? ( dev-libs/cyrus-sasl ) >=kde-frameworks/kross-5.26.0:5 dev-libs/cyrus-sasl:2 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=google ssl test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kimap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmbox-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 dev-libs/libical:= google? ( >=net-libs/libkgapi-5.1.0:5 ) ssl? ( dev-libs/cyrus-sasl ) !kde-apps/kdepim-kioslaves >=kde-frameworks/oxygen-icons-5.26.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kdepim-runtime:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-runtime-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c97d666a823e08e06329e2126b97f377
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.11_pre20160211
index a920ccebe079..96bab6135f34 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.11_pre20160211
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] dev-libs/b
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim-runtime.git&a=snapshot&h=bb194cc299839cb00b808c9c5740169815ba9e39&fmt=tgz -> kdepim-runtime-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=feee722f6a810f2dbd324c525f33c05d
diff --git a/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2016.01 b/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2016.01
index ff07cff1f84a..fa4c1477c8c5 100644
--- a/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/kdepim-kresources-4.4.2015:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/kdepim-wizards:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=93fc820907f2a4ee636100aac058a2a5
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r2 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r2
index ba9654ea2d08..70e9507d1634 100644
--- a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r2
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-err
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/Attic/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4014ed3d736bba9879f895be6ab90438
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r2 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r2
index 53317c9b51ad..2c3e9eb9f13e 100644
--- a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r2
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-err
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=a791b69599c3571ff2f4b1cc9033d8fb30f1bc33&fmt=tgz -> kdepimlibs-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a82f0e047c991b4a6fbb42d7cfbbaccf
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.04.3
index 60a95b1192ee..07c79b91e7b7 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr =dev-vcs/subversion-1.8* ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) !kde-base/kdesdk-kioslaves:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdesdk-kioslaves-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aafdf9403bd21898b9e13e168d26cead
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.08.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.08.3
index 1c9538725d43..4d6be2471ca1 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr =dev-vcs/subversion-1.8* ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) !kde-base/kdesdk-kioslaves:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdesdk-kioslaves-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c61ba128daec7d0a64081eb911011ffe
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.12.0 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.12.0
index 9eb406e34c73..314ae63079a7 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.12.0
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=subversion? ( dev-libs/apr =dev-vcs/subversion-1.8* ) subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 ) !kde-base/kdesdk-kioslaves:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kdesdk-kioslaves-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c61ba128daec7d0a64081eb911011ffe
diff --git a/metadata/md5-cache/kde-apps/kdesu-16.04.3 b/metadata/md5-cache/kde-apps/kdesu-16.04.3
index eb36274c6b4d..b1b18aa82a72 100644
--- a/metadata/md5-cache/kde-apps/kdesu-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdesu-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdesu:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=021f01d0c1b12563bff7701f497d88db
diff --git a/metadata/md5-cache/kde-apps/kdf-16.04.3 b/metadata/md5-cache/kde-apps/kdf-16.04.3
index 495fa73aaf3a..de133ec35473 100644
--- a/metadata/md5-cache/kde-apps/kdf-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdf-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdf:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdf-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3d0e4d6c703ebdae9e06a84c2adf8e2d
diff --git a/metadata/md5-cache/kde-apps/kdialog-16.04.3 b/metadata/md5-cache/kde-apps/kdialog-16.04.3
index 25c636e16108..2c54d7af1286 100644
--- a/metadata/md5-cache/kde-apps/kdialog-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdialog-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdialog:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7a7db922894e37b747fd5c77d992f38d
diff --git a/metadata/md5-cache/kde-apps/kdialog-16.08.3 b/metadata/md5-cache/kde-apps/kdialog-16.08.3
index c8290bf693ec..76d09b2a4669 100644
--- a/metadata/md5-cache/kde-apps/kdialog-16.08.3
+++ b/metadata/md5-cache/kde-apps/kdialog-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kdialog:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d100b85b2bdede637dde88dbceacc220
diff --git a/metadata/md5-cache/kde-apps/kdontchangethehostname-16.04.3 b/metadata/md5-cache/kde-apps/kdontchangethehostname-16.04.3
index 095efe3288b7..07d726639c5c 100644
--- a/metadata/md5-cache/kde-apps/kdontchangethehostname-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdontchangethehostname-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-apps/xauth !kde-base/kdontchangethehostname:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e1433388f4c23ceec2c4052cf012fb2e
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-16.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-16.04.3
index 123cdae81bb7..cd0b893bfc61 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-16.04.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/keditbookmarks:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=94fc6309bd57f810d047443b75258927
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-16.08.3 b/metadata/md5-cache/kde-apps/keditbookmarks-16.08.3
index aedaaa09a411..83b1ebe79171 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-16.08.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/keditbookmarks:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e0ea4c0daf08043cb0dc52defadfa20
diff --git a/metadata/md5-cache/kde-apps/keditfiletype-16.04.3 b/metadata/md5-cache/kde-apps/keditfiletype-16.04.3
index 877def33e4f7..95d1011a6bc2 100644
--- a/metadata/md5-cache/kde-apps/keditfiletype-16.04.3
+++ b/metadata/md5-cache/kde-apps/keditfiletype-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/keditfiletype:4 kde-frameworks/oxygen-icons dev-lang/perl >=de
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e2afc6bd3e2dcc5abd35cef95e65c17
diff --git a/metadata/md5-cache/kde-apps/kfile-16.04.3 b/metadata/md5-cache/kde-apps/kfile-16.04.3
index 6c5bb8b99299..173f09eb0044 100644
--- a/metadata/md5-cache/kde-apps/kfile-16.04.3
+++ b/metadata/md5-cache/kde-apps/kfile-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfile:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a3c9ffb8ffb5d83a2e0728678b5c69c
diff --git a/metadata/md5-cache/kde-apps/kfilereplace-16.04.3 b/metadata/md5-cache/kde-apps/kfilereplace-16.04.3
index 10d3cc2fd81d..4574d17142e1 100644
--- a/metadata/md5-cache/kde-apps/kfilereplace-16.04.3
+++ b/metadata/md5-cache/kde-apps/kfilereplace-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfilereplace:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdewebdev-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=77341feec7f504353fd3fa1bfed41baa
diff --git a/metadata/md5-cache/kde-apps/kfilereplace-16.08.3 b/metadata/md5-cache/kde-apps/kfilereplace-16.08.3
index de9541145fac..0671bda85cd0 100644
--- a/metadata/md5-cache/kde-apps/kfilereplace-16.08.3
+++ b/metadata/md5-cache/kde-apps/kfilereplace-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfilereplace:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c7fbfafe32cf6940c5d439d0b7a8422c
diff --git a/metadata/md5-cache/kde-apps/kfilereplace-16.12.0 b/metadata/md5-cache/kde-apps/kfilereplace-16.12.0
index 48212714c239..5f34800ea5c3 100644
--- a/metadata/md5-cache/kde-apps/kfilereplace-16.12.0
+++ b/metadata/md5-cache/kde-apps/kfilereplace-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfilereplace:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kfilereplace-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c60ac4e35a64becf26f239b0902f322c
diff --git a/metadata/md5-cache/kde-apps/kfind-16.04.3 b/metadata/md5-cache/kde-apps/kfind-16.04.3
index 3ede2e2d1139..da1fd2a43a7f 100644
--- a/metadata/md5-cache/kde-apps/kfind-16.04.3
+++ b/metadata/md5-cache/kde-apps/kfind-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/kfind:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9a06ea6bea430138024b0fe85a6a15dd
diff --git a/metadata/md5-cache/kde-apps/kfind-16.08.3 b/metadata/md5-cache/kde-apps/kfind-16.08.3
index ec144f992b81..ccfad94e0f16 100644
--- a/metadata/md5-cache/kde-apps/kfind-16.08.3
+++ b/metadata/md5-cache/kde-apps/kfind-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/kfind:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32110ebadc8a82cee44448258f139e4c
diff --git a/metadata/md5-cache/kde-apps/kfmclient-16.04.3 b/metadata/md5-cache/kde-apps/kfmclient-16.04.3
index 3e726859f446..d273adc6b43f 100644
--- a/metadata/md5-cache/kde-apps/kfmclient-16.04.3
+++ b/metadata/md5-cache/kde-apps/kfmclient-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfmclient:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=be3b66e1ddc92e1e403f55466248c29c
diff --git a/metadata/md5-cache/kde-apps/kfmclient-16.08.3 b/metadata/md5-cache/kde-apps/kfmclient-16.08.3
index 549a6fd1b011..dda0080b87aa 100644
--- a/metadata/md5-cache/kde-apps/kfmclient-16.08.3
+++ b/metadata/md5-cache/kde-apps/kfmclient-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kfmclient:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dd7dfa285825cb081b83fc3dba10da28
diff --git a/metadata/md5-cache/kde-apps/kget-16.04.3 b/metadata/md5-cache/kde-apps/kget-16.04.3
index 1bbfa33b5c98..ea0a8291a091 100644
--- a/metadata/md5-cache/kde-apps/kget-16.04.3
+++ b/metadata/md5-cache/kde-apps/kget-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] app-crypt/qca:2[qt4] kde-plasma/libkworkspace:4 bittorrent? ( >=net-libs/libktorrent-1.0.3:4 ) gpg? ( || ( >=kde-apps/gpgmepp-4.14.3:4[aqua=] >=kde-apps/kdepimlibs-4.14.3:4[aqua=] ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6:4 ) !kde-base/kget:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kget-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3b96b8982bc4ef6e4f8abdb70c3961ec
diff --git a/metadata/md5-cache/kde-apps/kget-16.08.3 b/metadata/md5-cache/kde-apps/kget-16.08.3
index b04e5cceeaa9..4df259021a4d 100644
--- a/metadata/md5-cache/kde-apps/kget-16.08.3
+++ b/metadata/md5-cache/kde-apps/kget-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] app-crypt/qca:2[qt4] bittorrent? ( >=net-libs/libktorrent-1.0.3:4 ) gpg? ( || ( >=kde-apps/gpgmepp-4.14.3:4[aqua=] >=kde-apps/kdepimlibs-4.14.3:4[aqua=] ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-base/kget:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kget-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5dd5c415b15b932ed6b559775d09fde8
diff --git a/metadata/md5-cache/kde-apps/kget-16.12.0 b/metadata/md5-cache/kde-apps/kget-16.12.0
index 74dfa56d35ac..b74a8bacbb30 100644
--- a/metadata/md5-cache/kde-apps/kget-16.12.0
+++ b/metadata/md5-cache/kde-apps/kget-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] app-crypt/qca:2[qt4] bittorrent? ( >=net-libs/libktorrent-1.0.3:4 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-base/kget:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kget-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7270ca55a1150d7edb9d65e14a7756f2
diff --git a/metadata/md5-cache/kde-apps/kglobalaccel-16.04.3 b/metadata/md5-cache/kde-apps/kglobalaccel-16.04.3
index 0510470fa848..7ca83091e8e5 100644
--- a/metadata/md5-cache/kde-apps/kglobalaccel-16.04.3
+++ b/metadata/md5-cache/kde-apps/kglobalaccel-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kglobalaccel:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=68245c8c2e892aa968a66184635878b6
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-16.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-16.04.3
index de39147cd1f7..8402accf6a7c 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-16.04.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] media-libs/libsndfile media-libs/openal !kde-base/kgoldrunner:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kgoldrunner-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e014fd716eb56811098adeb116c57a98
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-16.08.3 b/metadata/md5-cache/kde-apps/kgoldrunner-16.08.3
index 20388546ffeb..a1b7ce6e4d72 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-16.08.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] media-libs/libsndfile media-libs/openal !kde-base/kgoldrunner:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kgoldrunner-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63e876286677d997777b9f04b8d80a51
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-16.12.0 b/metadata/md5-cache/kde-apps/kgoldrunner-16.12.0
index 063694f05946..ebc5d80f3493 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-16.12.0
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] media-libs/libsndfile media-libs/openal !kde-base/kgoldrunner:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kgoldrunner-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63e876286677d997777b9f04b8d80a51
diff --git a/metadata/md5-cache/kde-apps/kgpg-16.04.3 b/metadata/md5-cache/kde-apps/kgpg-16.04.3
index 9b24efe2d4d3..1929617e6b07 100644
--- a/metadata/md5-cache/kde-apps/kgpg-16.04.3
+++ b/metadata/md5-cache/kde-apps/kgpg-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] app-crypt/gnupg !kde-base/kgpg:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-gpg ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kgpg-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2354432fa94d6d25fa0fd861f217601
diff --git a/metadata/md5-cache/kde-apps/kgpg-16.08.3 b/metadata/md5-cache/kde-apps/kgpg-16.08.3
index 029eee50974c..ae30847f2803 100644
--- a/metadata/md5-cache/kde-apps/kgpg-16.08.3
+++ b/metadata/md5-cache/kde-apps/kgpg-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] app-crypt/gnupg !kde-base/kgpg:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-gpg ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kgpg-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=19ddfb4140bdf41d9413ae7f0e55e734
diff --git a/metadata/md5-cache/kde-apps/kiconfinder-16.04.3 b/metadata/md5-cache/kde-apps/kiconfinder-16.04.3
index a41bc50b3a49..b9a90e0aaca8 100644
--- a/metadata/md5-cache/kde-apps/kiconfinder-16.04.3
+++ b/metadata/md5-cache/kde-apps/kiconfinder-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kiconfinder:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5aaf06f017423f5c5735381c55649b2a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-16.08.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-16.08.3
deleted file mode 100644
index 20f0b0bb3cd8..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kpimtextedit-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kpimtextedit-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kidentitymanagement:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kidentitymanagement-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=86e796932a7dd12dcea2a5f5dffd9884
diff --git a/metadata/md5-cache/kde-apps/kigo-16.04.3 b/metadata/md5-cache/kde-apps/kigo-16.04.3
index 8f02326d8e2e..f4ae98fc2667 100644
--- a/metadata/md5-cache/kde-apps/kigo-16.04.3
+++ b/metadata/md5-cache/kde-apps/kigo-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] games-board/gnugo !kde-base/kigo:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kigo-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=07dd460b656f215a66b6d7692529efad
diff --git a/metadata/md5-cache/kde-apps/kigo-16.08.3 b/metadata/md5-cache/kde-apps/kigo-16.08.3
index 41a8b7847990..581bc23a1934 100644
--- a/metadata/md5-cache/kde-apps/kigo-16.08.3
+++ b/metadata/md5-cache/kde-apps/kigo-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] games-board/gnugo !kde-base/kigo:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kigo-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59107c5675228b543907b0a2dc96b617
diff --git a/metadata/md5-cache/kde-apps/kigo-16.12.0 b/metadata/md5-cache/kde-apps/kigo-16.12.0
index c1b64b9d66e3..83f9e74e1f23 100644
--- a/metadata/md5-cache/kde-apps/kigo-16.12.0
+++ b/metadata/md5-cache/kde-apps/kigo-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] games-board/gnugo !kde-base/kigo:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kigo-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59107c5675228b543907b0a2dc96b617
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-16.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-16.04.3
index 6717048f64c6..c82547d96777 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-16.04.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kimagemapeditor:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdewebdev-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d489a6b22b6cea3da733fc40703552d1
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-16.08.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-16.08.3
index 70dd510f679e..a7bc2af3452c 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-16.08.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kimagemapeditor:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e62e3c7136642ea9599c26d9092df8dd
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-16.12.0 b/metadata/md5-cache/kde-apps/kimagemapeditor-16.12.0
index 639af2de2e64..d7743344d9cf 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-16.12.0
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kimagemapeditor:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kimagemapeditor-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b776717e7d404ca9c746311bff8dda17
diff --git a/metadata/md5-cache/kde-apps/kimap-16.08.3 b/metadata/md5-cache/kde-apps/kimap-16.08.3
deleted file mode 100644
index e0475ff098ac..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-3 !kde-apps/kimap:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kimap-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=893239049b786e2655d732e30a61763e
diff --git a/metadata/md5-cache/kde-apps/kimgio-16.04.3 b/metadata/md5-cache/kde-apps/kimgio-16.04.3
index d66f24fe0454..77ca7dfd0276 100644
--- a/metadata/md5-cache/kde-apps/kimgio-16.04.3
+++ b/metadata/md5-cache/kde-apps/kimgio-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libwebp:= !kde-base/kimgio:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=961d01e503f58c4bff15e33ccf118661
diff --git a/metadata/md5-cache/kde-apps/kioclient-16.04.3 b/metadata/md5-cache/kde-apps/kioclient-16.04.3
index 73c8e7ad3081..b8a0930b1bd5 100644
--- a/metadata/md5-cache/kde-apps/kioclient-16.04.3
+++ b/metadata/md5-cache/kde-apps/kioclient-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kioclient:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ccc982630ce8ed9dc58697861c8bb342
diff --git a/metadata/md5-cache/kde-apps/kjots-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kjots-4.14.11_pre20160211
index be07062a02d3..fdca2c5b07ae 100644
--- a/metadata/md5-cache/kde-apps/kjots-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kjots-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] dev-libs/grantlee:0 !kde-base/kjots:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.14.11_pre20160211:4[aqua=] )
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7c70f5964f0de760233afcd309b55a26
diff --git a/metadata/md5-cache/kde-apps/kjots-4.4.2016.01 b/metadata/md5-cache/kde-apps/kjots-4.4.2016.01
index c5cb14f60985..0e34ed080842 100644
--- a/metadata/md5-cache/kde-apps/kjots-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kjots-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/kjots:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=397982e40e951dc5ba23040e988247d1
diff --git a/metadata/md5-cache/kde-apps/kldap-16.08.3 b/metadata/md5-cache/kde-apps/kldap-16.08.3
deleted file mode 100644
index 2b69b5f73cc5..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/kmbox-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-nds/openldap ssl? ( dev-libs/cyrus-sasl ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=ssl debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/kmbox-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 net-nds/openldap ssl? ( dev-libs/cyrus-sasl ) !kde-apps/kdepim-kioslaves >=kde-frameworks/kf-env-3 !kde-apps/kldap:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kldap-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d1491d296bd2140a6ab2f6f6dd0e53ed
diff --git a/metadata/md5-cache/kde-apps/kleopatra-16.08.3 b/metadata/md5-cache/kde-apps/kleopatra-16.08.3
deleted file mode 100644
index 464eef8c4650..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5= >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-3 !kde-apps/kleopatra:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kleopatra-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=62f8c8f4be5c0a0ad2eef6031732bad7
diff --git a/metadata/md5-cache/kde-apps/kleopatra-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kleopatra-4.14.11_pre20160211
index 5f99768b13e2..19bccccbfe84 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kleopatra-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] >=app-crypt/gpgme-1.3.2 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error app-crypt/gnupg !kde-base/kleopatra:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=73d40ae8d09a7c67d366fbd5d2b0e735
diff --git a/metadata/md5-cache/kde-apps/kleopatra-4.4.2016.01 b/metadata/md5-cache/kde-apps/kleopatra-4.4.2016.01
index 69f539647f2f..36ea6a300a17 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kleopatra-4.4.2016.01
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme >=dev-libs/libassuan-2.0.0 dev-libs/libgpg-error >=kde-a
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e45a6f5c73b430f4fb303b111fe9df42
diff --git a/metadata/md5-cache/kde-apps/klinkstatus-16.04.3 b/metadata/md5-cache/kde-apps/klinkstatus-16.04.3
index e5e18d2049b6..2c46928f6fa0 100644
--- a/metadata/md5-cache/kde-apps/klinkstatus-16.04.3
+++ b/metadata/md5-cache/kde-apps/klinkstatus-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-base/klinkstatus:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdewebdev-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9680bdc8ce45b71cb9ae75f1f5452ef4
diff --git a/metadata/md5-cache/kde-apps/klinkstatus-16.08.3 b/metadata/md5-cache/kde-apps/klinkstatus-16.08.3
index 8749c44601cd..f344a222efa1 100644
--- a/metadata/md5-cache/kde-apps/klinkstatus-16.08.3
+++ b/metadata/md5-cache/kde-apps/klinkstatus-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-base/klinkstatus:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a707697043b32f4b446ccb4717ff52f7
diff --git a/metadata/md5-cache/kde-apps/klinkstatus-16.12.0 b/metadata/md5-cache/kde-apps/klinkstatus-16.12.0
index 8dbe75f87a51..d9f7ef65c2a5 100644
--- a/metadata/md5-cache/kde-apps/klinkstatus-16.12.0
+++ b/metadata/md5-cache/kde-apps/klinkstatus-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-base/klinkstatus:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/klinkstatus-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b2e2e7d220a3f2dfaad1c77207f19fc4
diff --git a/metadata/md5-cache/kde-apps/kmag-16.04.3 b/metadata/md5-cache/kde-apps/kmag-16.04.3
index eb167cf26110..887a575c623a 100644
--- a/metadata/md5-cache/kde-apps/kmag-16.04.3
+++ b/metadata/md5-cache/kde-apps/kmag-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kaccessible-4.14.3:4[aqua=] !kde-base/kmag:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kmag-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ca07c6de7fc970de677b1779f76d566
diff --git a/metadata/md5-cache/kde-apps/kmag-16.08.3 b/metadata/md5-cache/kde-apps/kmag-16.08.3
index e349799525c1..b0f939da3a5e 100644
--- a/metadata/md5-cache/kde-apps/kmag-16.08.3
+++ b/metadata/md5-cache/kde-apps/kmag-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kaccessible-4.14.3:4[aqua=] !kde-base/kmag:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmag-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=10d34abe838258f2e8376cfdfb7248d4
diff --git a/metadata/md5-cache/kde-apps/kmag-16.12.0 b/metadata/md5-cache/kde-apps/kmag-16.12.0
index 39aadf4335c1..33ac85b6d908 100644
--- a/metadata/md5-cache/kde-apps/kmag-16.12.0
+++ b/metadata/md5-cache/kde-apps/kmag-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kaccessible-4.14.3:4[aqua=] !kde-base/kmag:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kmag-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=10d34abe838258f2e8376cfdfb7248d4
diff --git a/metadata/md5-cache/kde-apps/kmail-16.08.3 b/metadata/md5-cache/kde-apps/kmail-16.08.3
deleted file mode 100644
index 1b734bea9299..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/libksieve-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtnetwork-5.7.0:5 >=dev-qt/qtwebengine-5.7.0:5[widgets] >=dev-qt/qtwidgets-5.7.0:5 >=dev-qt/qtxml-5.7.0:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kldap-16.08.3:5 dev-libs/boost:= dev-libs/libxslt test? ( >=kde-apps/akonadi-16.08.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.7.0:5 ) >=dev-qt/qtcore-5.7.0:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=kde-apps/libksieve-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtnetwork-5.7.0:5 >=dev-qt/qtwebengine-5.7.0:5[widgets] >=dev-qt/qtwidgets-5.7.0:5 >=dev-qt/qtxml-5.7.0:5 !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/kmail:4 >=dev-qt/qtcore-5.7.0:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8e963e6b7bf9bc0aa1f9815100c8f942
diff --git a/metadata/md5-cache/kde-apps/kmail-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kmail-4.14.11_pre20160211
index e26de87ff791..b6773ad92b12 100644
--- a/metadata/md5-cache/kde-apps/kmail-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kmail-4.14.11_pre20160211
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7fca671b70adfbaf03fccc84cc9ee702
diff --git a/metadata/md5-cache/kde-apps/kmail-4.4.2016.01 b/metadata/md5-cache/kde-apps/kmail-4.4.2016.01
index a2b140a91a72..9fd26a5cd305 100644
--- a/metadata/md5-cache/kde-apps/kmail-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kmail-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/kdelibs-4.13.1:4[aqua=] >=kde-apps/kdepimlibs-4.13.1:4[aqua=] >=kde-apps/libkdepim-4.4.11.1-r1:4[aqua=] >=kde-apps/libkleo-4.4.2015:4[aqua=] >=kde-apps/libkpgp-4.4.2015:4[aqua=] !>=kde-apps/kdepimlibs-4.14.11_pre20160211 !kde-base/kmail:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef597b533faecaa129e8535be3a0f604
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-16.08.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-16.08.3
deleted file mode 100644
index 1b484b2fb9b8..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kross-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kross-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-3 !kde-apps/kmail-account-wizard:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4186f6c41c2001aceb889a7a3ec4d5f1
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-16.08.3 b/metadata/md5-cache/kde-apps/kmailtransport-16.08.3
deleted file mode 100644
index 2fb276dc1840..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 ssl? ( dev-libs/cyrus-sasl ) test? ( >=kde-frameworks/ktextwidgets-5.26.0:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=ssl debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 ssl? ( dev-libs/cyrus-sasl ) !kde-apps/kdepim-kioslaves !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-3 !kde-apps/kmailtransport:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmailtransport-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3b59b72fe4e0984d2b82c1834211d5a3
diff --git a/metadata/md5-cache/kde-apps/kmbox-16.08.3 b/metadata/md5-cache/kde-apps/kmbox-16.08.3
deleted file mode 100644
index 1495fc8f172b..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-16.08.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kmbox:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmbox-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=58b9e817bc69dbdccfe2b713301c85b8
diff --git a/metadata/md5-cache/kde-apps/kmime-16.08.3 b/metadata/md5-cache/kde-apps/kmime-16.08.3
deleted file mode 100644
index 8d4db9910dc0..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kmime:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmime-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8cf9e3bafee978153100b10ccb374893
diff --git a/metadata/md5-cache/kde-apps/kmimetypefinder-16.04.3 b/metadata/md5-cache/kde-apps/kmimetypefinder-16.04.3
index 6428b9c0136b..dc7e0dbb3384 100644
--- a/metadata/md5-cache/kde-apps/kmimetypefinder-16.04.3
+++ b/metadata/md5-cache/kde-apps/kmimetypefinder-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kmimetypefinder:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2a0b4cfc9439c435028c16e7f7bca3b2
diff --git a/metadata/md5-cache/kde-apps/kmousetool-16.04.3 b/metadata/md5-cache/kde-apps/kmousetool-16.04.3
index 370db752309c..502ac408d2f5 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-16.04.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/knotify-4.14.3:4[aqua=] !kde-base/kmousetool:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kmousetool-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aa4db2ee0b6598034564b153dcd4f7cb
diff --git a/metadata/md5-cache/kde-apps/kmousetool-16.08.3 b/metadata/md5-cache/kde-apps/kmousetool-16.08.3
index 4466e17d2c61..f8d814e6d7a6 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-16.08.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=kde-apps/knotify-4.14.3:4[aqua=] !kde-base/kmousetool:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmousetool-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67c46070e35ea3b32108e1573bd16b92
diff --git a/metadata/md5-cache/kde-apps/kmousetool-16.12.0 b/metadata/md5-cache/kde-apps/kmousetool-16.12.0
index f2e3d07e40b3..7ec1fc284d57 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-16.12.0
+++ b/metadata/md5-cache/kde-apps/kmousetool-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=kde-apps/knotify-4.14.3:4[aqua=] !kde-base/kmousetool:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kmousetool-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67c46070e35ea3b32108e1573bd16b92
diff --git a/metadata/md5-cache/kde-apps/kmouth-16.04.3 b/metadata/md5-cache/kde-apps/kmouth-16.04.3
index dbcfda520146..5d50a6941b7f 100644
--- a/metadata/md5-cache/kde-apps/kmouth-16.04.3
+++ b/metadata/md5-cache/kde-apps/kmouth-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kmouth:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kmouth-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=02f3c2fdf0ba94169381ce0365422d76
diff --git a/metadata/md5-cache/kde-apps/kmouth-16.08.3 b/metadata/md5-cache/kde-apps/kmouth-16.08.3
index 8e647eec5a3e..100e8d02b634 100644
--- a/metadata/md5-cache/kde-apps/kmouth-16.08.3
+++ b/metadata/md5-cache/kde-apps/kmouth-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kmouth:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kmouth-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49c3331663f99da24f32f039504357b1
diff --git a/metadata/md5-cache/kde-apps/kmouth-16.12.0 b/metadata/md5-cache/kde-apps/kmouth-16.12.0
index 6044d1bd431e..c1a86e8082fc 100644
--- a/metadata/md5-cache/kde-apps/kmouth-16.12.0
+++ b/metadata/md5-cache/kde-apps/kmouth-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kmouth:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kmouth-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49c3331663f99da24f32f039504357b1
diff --git a/metadata/md5-cache/kde-apps/knetattach-16.04.3 b/metadata/md5-cache/kde-apps/knetattach-16.04.3
index d383304f482e..88d3c7978a70 100644
--- a/metadata/md5-cache/kde-apps/knetattach-16.04.3
+++ b/metadata/md5-cache/kde-apps/knetattach-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/knetattach:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4aa78f9f3df43f6f95a8f6ad0193436b
diff --git a/metadata/md5-cache/kde-apps/knewstuff-16.04.3 b/metadata/md5-cache/kde-apps/knewstuff-16.04.3
index e79fa3ad5255..05d9a16d5e62 100644
--- a/metadata/md5-cache/kde-apps/knewstuff-16.04.3
+++ b/metadata/md5-cache/kde-apps/knewstuff-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/knewstuff:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fcc0a264b616aa4c43d8d86c8b375102
diff --git a/metadata/md5-cache/kde-apps/knode-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/knode-4.14.11_pre20160211
index c9d281bf2890..3597a24abdc1 100644
--- a/metadata/md5-cache/kde-apps/knode-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/knode-4.14.11_pre20160211
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e27792b1da3107825801f73f87b11be0
diff --git a/metadata/md5-cache/kde-apps/knode-4.4.2016.01 b/metadata/md5-cache/kde-apps/knode-4.4.2016.01
index 31ceb0621792..843c8576e9ae 100644
--- a/metadata/md5-cache/kde-apps/knode-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/knode-4.4.2016.01
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2a74974e48a066f19756643528aa5501
diff --git a/metadata/md5-cache/kde-apps/knotes-16.08.3 b/metadata/md5-cache/kde-apps/knotes-16.08.3
deleted file mode 100644
index f1ab05c2eb9b..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kdnssd-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/kdnssd-5.26.0:5 >=kde-frameworks/kglobalaccel-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim >=kde-frameworks/kf-env-3 !kde-apps/knotes:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1f11461fe54a8bc5dd38bb9383d4ddbb
diff --git a/metadata/md5-cache/kde-apps/knotes-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/knotes-4.14.11_pre20160211
index a7bee8dc7a86..6aa8d6faee4f 100644
--- a/metadata/md5-cache/kde-apps/knotes-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/knotes-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] !kde-base/knotes:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.14.11_pre20160211:4[aqua=] )
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=11892b9f31577eed593d483914704986
diff --git a/metadata/md5-cache/kde-apps/knotes-4.4.2016.01 b/metadata/md5-cache/kde-apps/knotes-4.4.2016.01
index ced93cfd2fbb..83328c5bf584 100644
--- a/metadata/md5-cache/kde-apps/knotes-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/knotes-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/knotes:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3e42300c8e4edf8ab9e489b3abd1a66f
diff --git a/metadata/md5-cache/kde-apps/knotify-16.04.3 b/metadata/md5-cache/kde-apps/knotify-16.04.3
index b95266f57091..96e8cd5f746f 100644
--- a/metadata/md5-cache/kde-apps/knotify-16.04.3
+++ b/metadata/md5-cache/kde-apps/knotify-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/knotify:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6ce4a992b650edb8f76eb3b5c845e86
diff --git a/metadata/md5-cache/kde-apps/kolf-16.04.3 b/metadata/md5-cache/kde-apps/kolf-16.04.3
index ed3551ae4ebe..43f4ba23a5d1 100644
--- a/metadata/md5-cache/kde-apps/kolf-16.04.3
+++ b/metadata/md5-cache/kde-apps/kolf-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kolf:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kolf-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b516ee6d3fbced269ad95b523103af9
diff --git a/metadata/md5-cache/kde-apps/kolf-16.08.3 b/metadata/md5-cache/kde-apps/kolf-16.08.3
index a0d3b53b966c..68766fc7dc33 100644
--- a/metadata/md5-cache/kde-apps/kolf-16.08.3
+++ b/metadata/md5-cache/kde-apps/kolf-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kolf:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kolf-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=658cf2211133f8bb7e8bcd70fb1f5d48
diff --git a/metadata/md5-cache/kde-apps/kolf-16.12.0 b/metadata/md5-cache/kde-apps/kolf-16.12.0
index 8d363b30203d..e6b17e416f45 100644
--- a/metadata/md5-cache/kde-apps/kolf-16.12.0
+++ b/metadata/md5-cache/kde-apps/kolf-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kolf:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kolf-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=658cf2211133f8bb7e8bcd70fb1f5d48
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-16.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-16.04.3
index 2111a434ff29..c9777d4a5e43 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-16.04.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-16.04.3
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2
 RDEPEND=media-libs/qimageblitz scanner? ( >=kde-apps/libksane-4.14.3:4[aqua=] ) scanner? ( >=kde-apps/ksaneplugin-4.14.3:4[aqua=] ) !kde-base/kolourpaint:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kolourpaint-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=25dd28d0c3310e99b8a25c42091cb1da
diff --git a/metadata/md5-cache/kde-apps/kommander-16.04.3 b/metadata/md5-cache/kde-apps/kommander-16.04.3
index fd3598d12b80..c5a891d03f41 100644
--- a/metadata/md5-cache/kde-apps/kommander-16.04.3
+++ b/metadata/md5-cache/kde-apps/kommander-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kommander:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kdewebdev-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=126056528292a15d11edb5762f88f409
diff --git a/metadata/md5-cache/kde-apps/kommander-16.08.3 b/metadata/md5-cache/kde-apps/kommander-16.08.3
index 6a3888fabef0..e057b862edcf 100644
--- a/metadata/md5-cache/kde-apps/kommander-16.08.3
+++ b/metadata/md5-cache/kde-apps/kommander-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kommander:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=90a25d7f35d612587c0a9399a8bc7825
diff --git a/metadata/md5-cache/kde-apps/kommander-16.12.0 b/metadata/md5-cache/kde-apps/kommander-16.12.0
index b87eb3eeaffb..202873f29bcb 100644
--- a/metadata/md5-cache/kde-apps/kommander-16.12.0
+++ b/metadata/md5-cache/kde-apps/kommander-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kommander:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kommander-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=becf33bce5bacb8c7e59ac050349f27a
diff --git a/metadata/md5-cache/kde-apps/konq-plugins-16.04.3 b/metadata/md5-cache/kde-apps/konq-plugins-16.04.3
index caf4a722d86f..c47092089393 100644
--- a/metadata/md5-cache/kde-apps/konq-plugins-16.04.3
+++ b/metadata/md5-cache/kde-apps/konq-plugins-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-apps/kcmshell-4.14.3:4[aqua=] >=kde-apps/konqueror-4.14.3:4[aqua=] !kde-base/konq-plugins:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ab61b0327ec919f756de84f3fca0216
diff --git a/metadata/md5-cache/kde-apps/konq-plugins-16.08.3 b/metadata/md5-cache/kde-apps/konq-plugins-16.08.3
index 014bacde60d1..85f88e9e82ef 100644
--- a/metadata/md5-cache/kde-apps/konq-plugins-16.08.3
+++ b/metadata/md5-cache/kde-apps/konq-plugins-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] tidy? ( app-text/htmltidy ) !kde-misc/konq-plugins >=kde-apps/kcmshell-4.14.3:4[aqua=] >=kde-apps/konqueror-4.14.3:4[aqua=] !kde-base/konq-plugins:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=24e4733aa7cd6cbcee6c9efd70dfe675
diff --git a/metadata/md5-cache/kde-apps/konqueror-16.04.3-r1 b/metadata/md5-cache/kde-apps/konqueror-16.04.3-r1
index 8e1d36c810cb..e48c74a9ac06 100644
--- a/metadata/md5-cache/kde-apps/konqueror-16.04.3-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-16.04.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] filemanager? ( kde-frameworks/kactivi
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=69c35de6771ea92262590fa14389b927
diff --git a/metadata/md5-cache/kde-apps/konqueror-16.08.3 b/metadata/md5-cache/kde-apps/konqueror-16.08.3
index ce1771b24b57..3daa9600b2d8 100644
--- a/metadata/md5-cache/kde-apps/konqueror-16.08.3
+++ b/metadata/md5-cache/kde-apps/konqueror-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] filemanager? ( media-libs/phonon[qt4]
 RESTRICT=test
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=131d4a34048c148f99f46e9c3001944c
diff --git a/metadata/md5-cache/kde-apps/konquest-16.04.3 b/metadata/md5-cache/kde-apps/konquest-16.04.3
index c4c4da43f31c..0648e7120a18 100644
--- a/metadata/md5-cache/kde-apps/konquest-16.04.3
+++ b/metadata/md5-cache/kde-apps/konquest-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/konquest:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/konquest-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e71624080e0f00e3a50e38aa8d7242d6
diff --git a/metadata/md5-cache/kde-apps/konquest-16.08.3 b/metadata/md5-cache/kde-apps/konquest-16.08.3
index d89b871ceded..142ee815c647 100644
--- a/metadata/md5-cache/kde-apps/konquest-16.08.3
+++ b/metadata/md5-cache/kde-apps/konquest-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/konquest:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/konquest-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=101757ce282841023c07ecde00d0196a
diff --git a/metadata/md5-cache/kde-apps/konquest-16.12.0 b/metadata/md5-cache/kde-apps/konquest-16.12.0
index d6937bf00f5e..34467abd63cc 100644
--- a/metadata/md5-cache/kde-apps/konquest-16.12.0
+++ b/metadata/md5-cache/kde-apps/konquest-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/konquest:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/konquest-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=101757ce282841023c07ecde00d0196a
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-16.08.3 b/metadata/md5-cache/kde-apps/konsolekalendar-16.08.3
deleted file mode 100644
index 74dd6296664c..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-frameworks/kf-env-3 !kde-apps/konsolekalendar:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2c90f6fea2b6a448cbe65224f91087c0
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/konsolekalendar-4.14.11_pre20160211
index d43366966532..ce2820002202 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] !kde-base/konsolekalendar:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9ba5d356de8e8daf20424949d57ba118
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2016.01 b/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2016.01
index 3fbe637abc2e..423337166fde 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] !kde-base/konsolekalendar:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1a97d5e41b917120cf08f5a4028b20d
diff --git a/metadata/md5-cache/kde-apps/konsolepart-4.14.3 b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
index 1331712fe452..f8ddb4497eaa 100644
--- a/metadata/md5-cache/kde-apps/konsolepart-4.14.3
+++ b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/konsole-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ede60a72234bbd2e51db4ca15e8d1fe9
diff --git a/metadata/md5-cache/kde-apps/kontact-16.08.3 b/metadata/md5-cache/kde-apps/kontact-16.08.3
deleted file mode 100644
index 9d52397dbbc6..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim:5 >=kde-frameworks/kf-env-3 !kde-apps/kontact:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a598a29936e6993a4ca02048cf316fd4
diff --git a/metadata/md5-cache/kde-apps/kontact-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/kontact-4.14.11_pre20160211
index 321f7caff6c3..93e1bd74067d 100644
--- a/metadata/md5-cache/kde-apps/kontact-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/kontact-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] !kde-base/kontact:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5a72fd17e29bf4f47dfdf68423f9772d
diff --git a/metadata/md5-cache/kde-apps/kontact-4.4.2016.01 b/metadata/md5-cache/kde-apps/kontact-4.4.2016.01
index 759cecc8e607..027a2f79f9ac 100644
--- a/metadata/md5-cache/kde-apps/kontact-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kontact-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] !kde-base/kontact:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ffb8de4f57ff9430a17b36df2dfa9c41
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-16.08.3 b/metadata/md5-cache/kde-apps/kontactinterface-16.08.3
deleted file mode 100644
index ceddfb31f134..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kontactinterface:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kontactinterface-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=95afe389ff4ef4dacffb89f7d30d7427
diff --git a/metadata/md5-cache/kde-apps/kopete-16.04.3 b/metadata/md5-cache/kde-apps/kopete-16.04.3
index acd5cfeca006..e5ca57fa78d7 100644
--- a/metadata/md5-cache/kde-apps/kopete-16.04.3
+++ b/metadata/md5-cache/kde-apps/kopete-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.14.3:4[aqua=,zeroconf?] >=kde-apps/kdepimlibs-4.14.
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kopete-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a1b83856b2cd5da842658a82ee5e4e17
diff --git a/metadata/md5-cache/kde-apps/kopete-16.08.3 b/metadata/md5-cache/kde-apps/kopete-16.08.3
index 8c2acf889e36..1971b31610ec 100644
--- a/metadata/md5-cache/kde-apps/kopete-16.08.3
+++ b/metadata/md5-cache/kde-apps/kopete-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.14.3:4[aqua=,zeroconf?] >=kde-apps/kdepimlibs-4.14.
 RESTRICT=test
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kopete-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0daf8f4cc5237ce3b74f9495339e959b
diff --git a/metadata/md5-cache/kde-apps/kopete-16.12.0 b/metadata/md5-cache/kde-apps/kopete-16.12.0
index d99c6640e7c2..ed2e20bf652e 100644
--- a/metadata/md5-cache/kde-apps/kopete-16.12.0
+++ b/metadata/md5-cache/kde-apps/kopete-16.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/kdelibs-4.14.3:4[aqua=,zeroconf?] >=kde-apps/kdepimlibs-4.14.
 RESTRICT=test
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53eea03e81cecb2e478b15dd42b4b154
diff --git a/metadata/md5-cache/kde-apps/korganizer-16.08.3 b/metadata/md5-cache/kde-apps/korganizer-16.08.3
deleted file mode 100644
index cdef2bf0a78c..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) dev-libs/boost:= dev-libs/libxslt test? ( >=kde-apps/akonadi-16.08.3:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-calendar-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/eventviews-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kholidays-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kontactinterface-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 media-libs/phonon[qt5] X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/korganizer:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=48963ab7c1e0049e8a46a76020e2b551
diff --git a/metadata/md5-cache/kde-apps/korganizer-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/korganizer-4.14.11_pre20160211
index 5b4456e4c433..e0e3bb6bb96c 100644
--- a/metadata/md5-cache/kde-apps/korganizer-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/korganizer-4.14.11_pre20160211
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3259b1a3a239278a1fbade50756a8568
diff --git a/metadata/md5-cache/kde-apps/korganizer-4.4.2016.01 b/metadata/md5-cache/kde-apps/korganizer-4.4.2016.01
index 00aaea64293b..9ff7df79e5b5 100644
--- a/metadata/md5-cache/kde-apps/korganizer-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/korganizer-4.4.2016.01
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=82918d319f48862cf70460be62c9e0d8
diff --git a/metadata/md5-cache/kde-apps/kpasswdserver-16.04.3 b/metadata/md5-cache/kde-apps/kpasswdserver-16.04.3
index 00af04733289..a49b0c8348d4 100644
--- a/metadata/md5-cache/kde-apps/kpasswdserver-16.04.3
+++ b/metadata/md5-cache/kde-apps/kpasswdserver-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kpasswdserver:4 kde-frameworks/oxygen-icons dev-lang/perl >=de
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=988803c074623a51ffe590584d17cf70
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-16.08.3 b/metadata/md5-cache/kde-apps/kpimtextedit-16.08.3
deleted file mode 100644
index 1b9989c95d0e..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kemoticons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.6.1:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.26.0:5 >=dev-qt/designer-5.6.1:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kemoticons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.6.1:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kpimtextedit:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kpimtextedit-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=755d91f679731c02bf5af58976be1f5b
diff --git a/metadata/md5-cache/kde-apps/kppp-16.04.3 b/metadata/md5-cache/kde-apps/kppp-16.04.3
index 3c8992bcc2d3..bb6b0f7d9baa 100644
--- a/metadata/md5-cache/kde-apps/kppp-16.04.3
+++ b/metadata/md5-cache/kde-apps/kppp-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp !kde-base/kppp:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kppp-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f25c581d2c7d93f72f66aa9fe488071c
diff --git a/metadata/md5-cache/kde-apps/kppp-16.08.3 b/metadata/md5-cache/kde-apps/kppp-16.08.3
index 2524d120c624..3d69e6ea0d0b 100644
--- a/metadata/md5-cache/kde-apps/kppp-16.08.3
+++ b/metadata/md5-cache/kde-apps/kppp-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp !kde-base/kppp:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kppp-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e75c4ffe42f1cd393919c2a865a2683
diff --git a/metadata/md5-cache/kde-apps/kppp-16.12.0 b/metadata/md5-cache/kde-apps/kppp-16.12.0
index ead77f8c1e28..cdb291e68346 100644
--- a/metadata/md5-cache/kde-apps/kppp-16.12.0
+++ b/metadata/md5-cache/kde-apps/kppp-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp !kde-base/kppp:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kppp-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e75c4ffe42f1cd393919c2a865a2683
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-16.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-16.04.3
index 21922a448eaf..9e7d66d6ace9 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-16.04.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/plasma-runtime-4.14.3:4[aqua=] !kde-base/kqtquickcharts:4 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kqtquickcharts-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=592861767baa7d9526aaaed9c36a3435
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-16.08.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-16.08.3
index 138fa24e7327..8c00d2798bc0 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-16.08.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/plasma-runtime-4.14.3:4[aqua=] !kde-base/kqtquickcharts:4 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kqtquickcharts-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fdfb2dc2c194c3f0ad226083dfdd87ac
diff --git a/metadata/md5-cache/kde-apps/kquitapp-16.04.3 b/metadata/md5-cache/kde-apps/kquitapp-16.04.3
index c8ab40ba9dc8..968082eea006 100644
--- a/metadata/md5-cache/kde-apps/kquitapp-16.04.3
+++ b/metadata/md5-cache/kde-apps/kquitapp-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kquitapp:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a22041bffaa04cdbbe691a27def7bef0
diff --git a/metadata/md5-cache/kde-apps/kreadconfig-16.04.3 b/metadata/md5-cache/kde-apps/kreadconfig-16.04.3
index 99fe04852f50..02098c2104b9 100644
--- a/metadata/md5-cache/kde-apps/kreadconfig-16.04.3
+++ b/metadata/md5-cache/kde-apps/kreadconfig-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kreadconfig:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a5e5b61f55059f9b125b9d008133571c
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-16.04.3 b/metadata/md5-cache/kde-apps/kremotecontrol-16.04.3
index 43da74215f2b..bdc70816f17c 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-16.04.3
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/lirc !kde-base/kremotecontrol:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kremotecontrol-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d328b578099f73fffd7c2c14331571c1
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-16.08.3 b/metadata/md5-cache/kde-apps/kremotecontrol-16.08.3
index 7d1ab8398ad4..4c3d9fc0e539 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-16.08.3
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/lirc !kde-base/kremotecontrol:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kremotecontrol-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=72c412121e51afd4a1c70b0ec3de7e0f
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-16.12.0 b/metadata/md5-cache/kde-apps/kremotecontrol-16.12.0
index b8aa0d57f798..c521a6d0c560 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-16.12.0
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/lirc !kde-base/kremotecontrol:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kremotecontrol-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=72c412121e51afd4a1c70b0ec3de7e0f
diff --git a/metadata/md5-cache/kde-apps/kreversi-16.04.3 b/metadata/md5-cache/kde-apps/kreversi-16.04.3
index 9ef877d6f78b..a638d5cc3b58 100644
--- a/metadata/md5-cache/kde-apps/kreversi-16.04.3
+++ b/metadata/md5-cache/kde-apps/kreversi-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kreversi:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kreversi-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5dbd4276db181e5a7ee39bf199bfdf24
diff --git a/metadata/md5-cache/kde-apps/kreversi-16.08.3 b/metadata/md5-cache/kde-apps/kreversi-16.08.3
index 244d8b900c05..53c6a624ae73 100644
--- a/metadata/md5-cache/kde-apps/kreversi-16.08.3
+++ b/metadata/md5-cache/kde-apps/kreversi-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kreversi:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kreversi-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=133fff9889dccc040663f823ab2f2fa2
diff --git a/metadata/md5-cache/kde-apps/kreversi-16.12.0 b/metadata/md5-cache/kde-apps/kreversi-16.12.0
index 58ae655921a2..e4aca41450a6 100644
--- a/metadata/md5-cache/kde-apps/kreversi-16.12.0
+++ b/metadata/md5-cache/kde-apps/kreversi-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kreversi:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kreversi-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=133fff9889dccc040663f823ab2f2fa2
diff --git a/metadata/md5-cache/kde-apps/krfb-15.08.3 b/metadata/md5-cache/kde-apps/krfb-15.08.3
index d31a6c33d9e0..aab06c2618f3 100644
--- a/metadata/md5-cache/kde-apps/krfb-15.08.3
+++ b/metadata/md5-cache/kde-apps/krfb-15.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libvncserver-0.9.9 sys-libs/zlib virtual/jpeg:0 !aqua? ( x11-
 REQUIRED_USE=ktp? ( telepathy )
 SLOT=4/15.08
 SRC_URI=mirror://kde/Attic/applications/15.08.3/src/krfb-15.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=519e9330eabcf143d1bfdcb1ce33cf13
diff --git a/metadata/md5-cache/kde-apps/ksaneplugin-16.04.3 b/metadata/md5-cache/kde-apps/ksaneplugin-16.04.3
index 85a3fc08bbef..30b86855a95e 100644
--- a/metadata/md5-cache/kde-apps/ksaneplugin-16.04.3
+++ b/metadata/md5-cache/kde-apps/ksaneplugin-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libksane-4.14.3:4[aqua=] !kde-base/ksaneplugin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/ksaneplugin-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bdc1beb14cd17b1fd3ac9a30cc75d125
diff --git a/metadata/md5-cache/kde-apps/ksaneplugin-16.08.3 b/metadata/md5-cache/kde-apps/ksaneplugin-16.08.3
index 7e3f6f939ddc..5e90acc0fced 100644
--- a/metadata/md5-cache/kde-apps/ksaneplugin-16.08.3
+++ b/metadata/md5-cache/kde-apps/ksaneplugin-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libksane-4.14.3:4[aqua=] !kde-base/ksaneplugin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ksaneplugin-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3de1e864db60a35b20f8e7ec4f3b20dc
diff --git a/metadata/md5-cache/kde-apps/ksaneplugin-16.12.0 b/metadata/md5-cache/kde-apps/ksaneplugin-16.12.0
index f918875e05e1..f7e5be846b2c 100644
--- a/metadata/md5-cache/kde-apps/ksaneplugin-16.12.0
+++ b/metadata/md5-cache/kde-apps/ksaneplugin-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libksane-4.14.3:4[aqua=] !kde-base/ksaneplugin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/ksaneplugin-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3de1e864db60a35b20f8e7ec4f3b20dc
diff --git a/metadata/md5-cache/kde-apps/kscd-16.04.3 b/metadata/md5-cache/kde-apps/kscd-16.04.3
index 1fa5a34231c9..6d807335ec7f 100644
--- a/metadata/md5-cache/kde-apps/kscd-16.04.3
+++ b/metadata/md5-cache/kde-apps/kscd-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkcddb-4.14.3:4[aqua=] >=kde-apps/libkcompactdisc-4.14.3:4[aqua=] media-libs/musicbrainz:3 !kde-base/kscd:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kscd-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=314e5fe1550387664e802cd8a722cc48
diff --git a/metadata/md5-cache/kde-apps/kscd-16.08.3 b/metadata/md5-cache/kde-apps/kscd-16.08.3
index 59baeaa4ac76..fd8475642eca 100644
--- a/metadata/md5-cache/kde-apps/kscd-16.08.3
+++ b/metadata/md5-cache/kde-apps/kscd-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkcddb-4.14.3:4[aqua=] >=kde-apps/libkcompactdisc-4.14.3:4[aqua=] media-libs/musicbrainz:3 media-libs/phonon[qt4] !kde-base/kscd:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kscd-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fd6c5ed100d133dbb3deea94fe567729
diff --git a/metadata/md5-cache/kde-apps/kscd-16.12.0 b/metadata/md5-cache/kde-apps/kscd-16.12.0
index a7ff40aacfa2..678b06b1040c 100644
--- a/metadata/md5-cache/kde-apps/kscd-16.12.0
+++ b/metadata/md5-cache/kde-apps/kscd-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/musicbrainz:3 media-libs/phonon[qt4] !kde-base/kscd:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kscd-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=818c01093d15ccfd9ca4e025993e7ca5
diff --git a/metadata/md5-cache/kde-apps/ksirk-16.04.3 b/metadata/md5-cache/kde-apps/ksirk-16.04.3
index 701b3a98cef5..4c084a7b6618 100644
--- a/metadata/md5-cache/kde-apps/ksirk-16.04.3
+++ b/metadata/md5-cache/kde-apps/ksirk-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] app-crypt/qca:2[qt4] sys-libs/zlib !kde-base/ksirk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/ksirk-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=62834f6771e02de71467d1dd812e5694
diff --git a/metadata/md5-cache/kde-apps/ksirk-16.08.3 b/metadata/md5-cache/kde-apps/ksirk-16.08.3
index 4dfad6a65c0c..50f2cb30fb3c 100644
--- a/metadata/md5-cache/kde-apps/ksirk-16.08.3
+++ b/metadata/md5-cache/kde-apps/ksirk-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] app-crypt/qca:2[qt4] media-libs/phonon[qt4] sys-libs/zlib !kde-base/ksirk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ksirk-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4c52e7bdd21132c5feb4d1777c98535f
diff --git a/metadata/md5-cache/kde-apps/ksirk-16.12.0 b/metadata/md5-cache/kde-apps/ksirk-16.12.0
index 648fae1d0a7b..4056594941d8 100644
--- a/metadata/md5-cache/kde-apps/ksirk-16.12.0
+++ b/metadata/md5-cache/kde-apps/ksirk-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] app-crypt/qca:2[qt4] media-libs/phonon[qt4] sys-libs/zlib !kde-base/ksirk:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/ksirk-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4c52e7bdd21132c5feb4d1777c98535f
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-16.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-16.04.3
index d6062faedf2a..4083521c51bd 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-16.04.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/ksnakeduel:4 kde-frameworks/oxygen-icons selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/ksnakeduel-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d214be031c273c94935cd0d24254739e
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-16.08.3 b/metadata/md5-cache/kde-apps/ksnakeduel-16.08.3
index e9e182117108..b2b198c6c4a3 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-16.08.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/ksnakeduel:4 kde-frameworks/oxygen-icons selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ksnakeduel-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2de86d3eb4279ad46bb8cdd93a799cc0
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-16.12.0 b/metadata/md5-cache/kde-apps/ksnakeduel-16.12.0
index 629a656ad313..82d3f4b12c39 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-16.12.0
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/ksnakeduel:4 kde-frameworks/oxygen-icons selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/ksnakeduel-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2de86d3eb4279ad46bb8cdd93a799cc0
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-16.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-16.04.3
index 577c20f301d4..10629dcc0adf 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-16.04.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kspaceduel:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kspaceduel-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c04bf9e7240509f80c2f20f66e8b5b29
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-16.08.3 b/metadata/md5-cache/kde-apps/kspaceduel-16.08.3
index 1459157a6277..fc9b60d6d01a 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-16.08.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kspaceduel:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kspaceduel-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc0465c5573cfdcc8c5a4f1601374230
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-16.12.0 b/metadata/md5-cache/kde-apps/kspaceduel-16.12.0
index aa16d8e8bda5..5ca7d8be1eb9 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-16.12.0
+++ b/metadata/md5-cache/kde-apps/kspaceduel-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/kspaceduel:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kspaceduel-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc0465c5573cfdcc8c5a4f1601374230
diff --git a/metadata/md5-cache/kde-apps/kstart-16.04.3 b/metadata/md5-cache/kde-apps/kstart-16.04.3
index c52c2007c0fe..3ef2ccf38fe2 100644
--- a/metadata/md5-cache/kde-apps/kstart-16.04.3
+++ b/metadata/md5-cache/kde-apps/kstart-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kstart:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c57616fe4b5314002b1dd2ba8ab23287
diff --git a/metadata/md5-cache/kde-apps/ksudoku-16.04.3 b/metadata/md5-cache/kde-apps/ksudoku-16.04.3
index 1e9c7b3867d6..540018796ac0 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-16.04.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] opengl? ( virtual/glu ) !kde-base/ksudoku:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/ksudoku-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f371ecb67510c177137c1621a065eb5
diff --git a/metadata/md5-cache/kde-apps/ksudoku-16.08.3 b/metadata/md5-cache/kde-apps/ksudoku-16.08.3
index 5bf9957d5b4b..77d52e6fd9c0 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-16.08.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] opengl? ( virtual/glu ) !kde-base/ksudoku:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ksudoku-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=053c6b296f71f3ed91bcab5a0c6f36ce
diff --git a/metadata/md5-cache/kde-apps/ksudoku-16.12.0 b/metadata/md5-cache/kde-apps/ksudoku-16.12.0
index 4e0c0f859e5c..ee23ba99bfea 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-16.12.0
+++ b/metadata/md5-cache/kde-apps/ksudoku-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] opengl? ( virtual/glu ) !kde-base/ksudoku:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/ksudoku-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=053c6b296f71f3ed91bcab5a0c6f36ce
diff --git a/metadata/md5-cache/kde-apps/ktimetracker-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/ktimetracker-4.14.11_pre20160211
index d9c34f0f0006..7e430bc6c8e7 100644
--- a/metadata/md5-cache/kde-apps/ktimetracker-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/ktimetracker-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-kresources-4.14.11_pre20160211:4[aqua=] >=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] >=kde-apps/kdepim-common-libs-4.14.11_pre20160211:4[aqua=] x11-libs/libXScrnSaver !kde-base/ktimetracker:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.14.11_pre20160211:4[aqua=] )
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6af7d8a450ed598bf9571073546c3871
diff --git a/metadata/md5-cache/kde-apps/ktimetracker-4.4.2016.01 b/metadata/md5-cache/kde-apps/ktimetracker-4.4.2016.01
index 68ce45b75a31..02f54165abb1 100644
--- a/metadata/md5-cache/kde-apps/ktimetracker-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/ktimetracker-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-kresources-4.4.2015:4[aqua=] >=kde-apps/kdepimlibs-4.6:4[aqua=] >=kde-apps/libkdepim-4.4.2015:4[aqua=] x11-libs/libXScrnSaver !kde-base/ktimetracker:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] kontact? ( >=kde-apps/kontact-4.4.2016.01:4[aqua=] )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=afc11880c9cbf640738a023202f62e31
diff --git a/metadata/md5-cache/kde-apps/ktimezoned-16.04.3 b/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
index 0213c1ee9325..7dc9f7413887 100644
--- a/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
+++ b/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/ktimezoned:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=03152b1c44a0051c07b8dce73dcc311a
diff --git a/metadata/md5-cache/kde-apps/ktnef-16.08.3 b/metadata/md5-cache/kde-apps/ktnef-16.08.3
deleted file mode 100644
index cc7c654f39c9..000000000000
--- a/metadata/md5-cache/kde-apps/ktnef-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/libktnef-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Viewer for TNEF attachments (proprietary MS Outlook/Exchange Server format)
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/libktnef-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/ktnef:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a9f1bbc4c8bc9e401cc93839d3bdd5c7
diff --git a/metadata/md5-cache/kde-apps/ktnef-4.14.11_pre20160211 b/metadata/md5-cache/kde-apps/ktnef-4.14.11_pre20160211
index d983ba113627..f292cd1e04a4 100644
--- a/metadata/md5-cache/kde-apps/ktnef-4.14.11_pre20160211
+++ b/metadata/md5-cache/kde-apps/ktnef-4.14.11_pre20160211
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-apps/kdepimlibs-4.14.11_pre20160211:4[aqua=,akonadi(+)] kde-apps/akonadi:4 !kde-base/ktnef:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=2aec255c6465676404e4694405c153e485e477d9&fmt=tgz -> kdepim-4.14.11_pre20160211.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bb5104287d4051fba7b72f78ed381db3
diff --git a/metadata/md5-cache/kde-apps/ktouch-16.04.3 b/metadata/md5-cache/kde-apps/ktouch-16.04.3
index 3216f9c2aaac..888afca3c14c 100644
--- a/metadata/md5-cache/kde-apps/ktouch-16.04.3
+++ b/metadata/md5-cache/kde-apps/ktouch-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/knotify-4.14.3:4[aqua=] >=kde-apps/kqtquickcharts-4.14.3:4[aqua=] >=kde-apps/plasma-runtime-4.14.3:4[aqua=] !kde-base/ktouch:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/ktouch-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=98b3ad87891b52c698e1ae76a55d3ce1
diff --git a/metadata/md5-cache/kde-apps/ktouch-16.08.3 b/metadata/md5-cache/kde-apps/ktouch-16.08.3
index 4efdd3aa5d71..b8d66796bf2a 100644
--- a/metadata/md5-cache/kde-apps/ktouch-16.08.3
+++ b/metadata/md5-cache/kde-apps/ktouch-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/knotify-4.14.3:4[aqua=] >=kde-apps/kqtquickcharts-4.14.3:4[aqua=] >=kde-apps/plasma-runtime-4.14.3:4[aqua=] !kde-base/ktouch:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/ktouch-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c7a7b94ebb379645801d929ea3e1be52
diff --git a/metadata/md5-cache/kde-apps/ktraderclient-16.04.3 b/metadata/md5-cache/kde-apps/ktraderclient-16.04.3
index 1ec8c8143061..8fc9cff46ba8 100644
--- a/metadata/md5-cache/kde-apps/ktraderclient-16.04.3
+++ b/metadata/md5-cache/kde-apps/ktraderclient-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/ktraderclient:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8d6605513af973e9d2d33d1dc45d191d
diff --git a/metadata/md5-cache/kde-apps/kubrick-16.04.3 b/metadata/md5-cache/kde-apps/kubrick-16.04.3
index a346b19d8bda..fc78cd28dded 100644
--- a/metadata/md5-cache/kde-apps/kubrick-16.04.3
+++ b/metadata/md5-cache/kde-apps/kubrick-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] virtual/glu !kde-base/kubrick:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kubrick-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e8aa28d260a601520b68e8ab52fefc77
diff --git a/metadata/md5-cache/kde-apps/kubrick-16.08.3 b/metadata/md5-cache/kde-apps/kubrick-16.08.3
index 13347b9e90a0..a024c335e79a 100644
--- a/metadata/md5-cache/kde-apps/kubrick-16.08.3
+++ b/metadata/md5-cache/kde-apps/kubrick-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] virtual/glu !kde-base/kubrick:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kubrick-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=71b604ec1e0d01505297f0f01c576843
diff --git a/metadata/md5-cache/kde-apps/kubrick-16.12.0 b/metadata/md5-cache/kde-apps/kubrick-16.12.0
index 7b63c163ab6d..62beebde9cbe 100644
--- a/metadata/md5-cache/kde-apps/kubrick-16.12.0
+++ b/metadata/md5-cache/kde-apps/kubrick-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] virtual/glu !kde-base/kubrick:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/kubrick-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=71b604ec1e0d01505297f0f01c576843
diff --git a/metadata/md5-cache/kde-apps/kuiserver-16.04.3 b/metadata/md5-cache/kde-apps/kuiserver-16.04.3
index 3aec8ad062df..796eb91826f4 100644
--- a/metadata/md5-cache/kde-apps/kuiserver-16.04.3
+++ b/metadata/md5-cache/kde-apps/kuiserver-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/kuiserver:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c95e26e89e47fc3bbdef33c78d7563fe
diff --git a/metadata/md5-cache/kde-apps/kurifilter-plugins-16.04.3 b/metadata/md5-cache/kde-apps/kurifilter-plugins-16.04.3
index dbbad6829ba7..8b37116c4c7b 100644
--- a/metadata/md5-cache/kde-apps/kurifilter-plugins-16.04.3
+++ b/metadata/md5-cache/kde-apps/kurifilter-plugins-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/kurifilter-plugins:4 kde-frameworks/oxygen-icons dev-lang/perl
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e11b2440781af54611764230885f679
diff --git a/metadata/md5-cache/kde-apps/kuser-16.04.3 b/metadata/md5-cache/kde-apps/kuser-16.04.3
deleted file mode 100644
index afe352f1f92f..000000000000
--- a/metadata/md5-cache/kde-apps/kuser-16.04.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-DESCRIPTION=KDE application that helps you manage system users
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kuser/
-IUSE=debug +handbook aqua
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] >=kde-apps/knotify-4.14.3:4[aqua=] !kde-base/kuser:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-SLOT=4/16.04
-SRC_URI=mirror://kde/stable/applications/16.04.3/src/kuser-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c63e9a8c42f9e6316cc5d040f54d2688
diff --git a/metadata/md5-cache/kde-apps/kuser-16.08.3 b/metadata/md5-cache/kde-apps/kuser-16.08.3
deleted file mode 100644
index aa3f56b30400..000000000000
--- a/metadata/md5-cache/kde-apps/kuser-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 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.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-DESCRIPTION=KDE application that helps you manage system users
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kuser/
-IUSE=debug +handbook aqua
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] >=kde-apps/knotify-4.14.3:4[aqua=] !kde-base/kuser:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
-SLOT=4/16.08
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kuser-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dbd40f3b01e657cf9895c1c60ab0632c
diff --git a/metadata/md5-cache/kde-apps/kwalletd-16.04.3 b/metadata/md5-cache/kde-apps/kwalletd-16.04.3
index 3d486069692f..763fce575254 100644
--- a/metadata/md5-cache/kde-apps/kwalletd-16.04.3
+++ b/metadata/md5-cache/kde-apps/kwalletd-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= gpg? ( app-crypt/gpgme || ( >=kde-apps/gpgmepp-4.1
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=70f5013eacc83dbb848850980aa86f04
diff --git a/metadata/md5-cache/kde-apps/kwalletd-16.04.3-r1 b/metadata/md5-cache/kde-apps/kwalletd-16.04.3-r1
index 644c031a1d77..fe5e186c4631 100644
--- a/metadata/md5-cache/kde-apps/kwalletd-16.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kwalletd-16.04.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0= gpg? ( app-crypt/gpgme[cxx] ) !kde-base/kwalletd:4
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=597e4e8198a0c5523d386ffb927cd029
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-15.04.3-r1 b/metadata/md5-cache/kde-apps/kwalletmanager-15.04.3-r1
index c55f804163a5..0f21e848ae9a 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-15.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-15.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-apps/kwalletmanager:5 !kde-base/kwalletmanager:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/15.04
 SRC_URI=mirror://kde/Attic/applications/15.04.3/src/kwalletmanager-15.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eeefb93e3b23dabf8662e7acad957683
diff --git a/metadata/md5-cache/kde-apps/libgravatar-16.08.3 b/metadata/md5-cache/kde-apps/libgravatar-16.08.3
deleted file mode 100644
index 8dd3bdb87be0..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/libgravatar:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/libgravatar-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4a62d43733271c47efe95da03df9a911
diff --git a/metadata/md5-cache/kde-apps/libkcddb-16.04.3 b/metadata/md5-cache/kde-apps/libkcddb-16.04.3
index 9a144244e913..a047048fc60a 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-16.04.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=musicbrainz? ( media-libs/musicbrainz:5 ) !kde-base/libkcddb:4 kde-frame
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/libkcddb-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3dd655d292a7993fac2d3cbcf7d977f7
diff --git a/metadata/md5-cache/kde-apps/libkcddb-16.08.3 b/metadata/md5-cache/kde-apps/libkcddb-16.08.3
index a6ad5164ee74..193cbd113037 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-16.08.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=musicbrainz? ( media-libs/musicbrainz:5 ) !kde-base/libkcddb:4 kde-frame
 RESTRICT=test
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/libkcddb-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cf85062699a6175da82ebbdc6b3abbe2
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-16.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-16.04.3
index 5a55a72ef693..9a7ddea7d977 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-16.04.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] alsa? ( media-libs/alsa-lib ) !kde-base/libkcompactdisc:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/libkcompactdisc-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4916d5cbc0ce88d1b088131278b3a159
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-16.08.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-16.08.3
index d3e32d2a088b..6c395b9f4cb7 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-16.08.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] alsa? ( media-libs/alsa-lib ) !kde-base/libkcompactdisc:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/libkcompactdisc-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9c0589effe29422c58562b4f6733bdf6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-15.08.3 b/metadata/md5-cache/kde-apps/libkdcraw-15.08.3
index a40849202bc0..7fad6d96c683 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-15.08.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-15.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libraw-0.16_beta1-r1:= !kde-base/libkdcraw:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/15.08
 SRC_URI=mirror://kde/Attic/applications/15.08.3/src/libkdcraw-15.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=15f94911f3c303cd86984f75180e7566
diff --git a/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1 b/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
index 8b3de8058593..21d0fef5e8a0 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
+++ b/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal !kde-base/libkdegames:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/libkdegames-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2398831ab6a0ab1342620a602d95b2dd
diff --git a/metadata/md5-cache/kde-apps/libkdepim-16.08.3 b/metadata/md5-cache/kde-apps/libkdepim-16.08.3
deleted file mode 100644
index b483b4bbf6f5..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.26.0:5 >=dev-qt/designer-5.6.1:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-search-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/libkdepim:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/libkdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8765ce97c922cdeab33ace3c755d6748
diff --git a/metadata/md5-cache/kde-apps/libkdepim-4.4.2016.01 b/metadata/md5-cache/kde-apps/libkdepim-4.4.2016.01
index a0392d48e248..3cc749204e35 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/libkdepim-4.4.2016.01
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.6:4[aqua=] !kde-base/libkdepim:4 kde-frameworks/
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d30c4cb0c92c9be300110c3e469eb62d
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-15.08.3 b/metadata/md5-cache/kde-apps/libkexiv2-15.08.3
index a819ebb895d4..ad51af97b16f 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-15.08.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-15.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-gfx/exiv2-0.24:=[xmp=] virtual/jpeg:0 !kde-base/libkexiv2:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/15.08
 SRC_URI=mirror://kde/Attic/applications/15.08.3/src/libkexiv2-15.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a050cca001068e6cf575c0c926a2ab7c
diff --git a/metadata/md5-cache/kde-apps/libkleo-16.08.3 b/metadata/md5-cache/kde-apps/libkleo-16.08.3
deleted file mode 100644
index 284ca9112d55..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=dev-qt/designer-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/libkleo:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/libkleo-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=41a70dd1f1df5c194639c58ed8ceb64a
diff --git a/metadata/md5-cache/kde-apps/libkleo-4.4.2016.01 b/metadata/md5-cache/kde-apps/libkleo-4.4.2016.01
index 64d3633bc8a5..dd9f89653c2f 100644
--- a/metadata/md5-cache/kde-apps/libkleo-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/libkleo-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=kde-apps/kdepimlibs-4.6:4[aqua=] app-crypt/gnupg !kde-base/libkleo:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bf8213b41daaf3e354632b4db4d5490b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-4.14.3 b/metadata/md5-cache/kde-apps/libkmahjongg-4.14.3
index 0c3f05fd54c4..fcf25874fadc 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-4.14.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/libkmahjongg:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/libkmahjongg-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1780d3b80807789026211a20683abded
diff --git a/metadata/md5-cache/kde-apps/libkonq-16.04.3 b/metadata/md5-cache/kde-apps/libkonq-16.04.3
index 97cdde7250d7..46ad3f00dab9 100644
--- a/metadata/md5-cache/kde-apps/libkonq-16.04.3
+++ b/metadata/md5-cache/kde-apps/libkonq-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=!kde-base/libkonq:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/q
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67f63a915adc3b49ca374a6a661bb34c
diff --git a/metadata/md5-cache/kde-apps/libkonq-16.08.3 b/metadata/md5-cache/kde-apps/libkonq-16.08.3
index 45c510aade97..e46737dc8472 100644
--- a/metadata/md5-cache/kde-apps/libkonq-16.08.3
+++ b/metadata/md5-cache/kde-apps/libkonq-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/phonon[qt4] !kde-base/libkonq:4 kde-frameworks/oxygen-icons d
 RESTRICT=test
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3b7f6012019ac41a3cb9d9a5760bf561
diff --git a/metadata/md5-cache/kde-apps/libkpgp-4.4.2016.01 b/metadata/md5-cache/kde-apps/libkpgp-4.4.2016.01
index 4a13f406cdb0..6a7576791dad 100644
--- a/metadata/md5-cache/kde-apps/libkpgp-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/libkpgp-4.4.2016.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/libkpgp:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2016.01.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d453dbcb839fab7aeccc766faaa8e690
diff --git a/metadata/md5-cache/kde-apps/libksane-15.08.3-r1 b/metadata/md5-cache/kde-apps/libksane-15.08.3-r1
index 15512afba595..9f8b6b777f89 100644
--- a/metadata/md5-cache/kde-apps/libksane-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/libksane-15.08.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=media-gfx/sane-backends !kde-base/libksane:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/15.08
 SRC_URI=mirror://kde/Attic/applications/15.08.3/src/libksane-15.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=981887e0561ece610b930180d14f6107
diff --git a/metadata/md5-cache/kde-apps/libksieve-16.08.3 b/metadata/md5-cache/kde-apps/libksieve-16.08.3
deleted file mode 100644
index 52ec63786893..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5=[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 ssl? ( dev-libs/cyrus-sasl ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=ssl test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5=[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 ssl? ( dev-libs/cyrus-sasl ) !kde-apps/kdepim-kioslaves >=kde-frameworks/kf-env-3 !kde-apps/libksieve:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/libksieve-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=699c3dd811c470446bd020d903c9fe39
diff --git a/metadata/md5-cache/kde-apps/libktnef-16.08.3 b/metadata/md5-cache/kde-apps/libktnef-16.08.3
deleted file mode 100644
index eb18f7b48a23..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcalutils-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-frameworks/kf-env-3 !kde-apps/libktnef:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/ktnef-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e8f72e4dff23561ddf9aa0353aa4845f
diff --git a/metadata/md5-cache/kde-apps/lskat-16.04.3 b/metadata/md5-cache/kde-apps/lskat-16.04.3
index ae61077ac6e8..9c398b2d2ef1 100644
--- a/metadata/md5-cache/kde-apps/lskat-16.04.3
+++ b/metadata/md5-cache/kde-apps/lskat-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/lskat:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/lskat-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bd9efb6fc302c45f6f5ec3b2ed3d5a35
diff --git a/metadata/md5-cache/kde-apps/lskat-16.08.3 b/metadata/md5-cache/kde-apps/lskat-16.08.3
index 61fa56ec1c87..f4f61f498865 100644
--- a/metadata/md5-cache/kde-apps/lskat-16.08.3
+++ b/metadata/md5-cache/kde-apps/lskat-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/lskat:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/lskat-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1cee3b1e5a89f957f25f85550abe026
diff --git a/metadata/md5-cache/kde-apps/lskat-16.12.0 b/metadata/md5-cache/kde-apps/lskat-16.12.0
index 6390ee582b59..288f88a9ebd6 100644
--- a/metadata/md5-cache/kde-apps/lskat-16.12.0
+++ b/metadata/md5-cache/kde-apps/lskat-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/lskat:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/lskat-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1cee3b1e5a89f957f25f85550abe026
diff --git a/metadata/md5-cache/kde-apps/mailcommon-16.08.3 b/metadata/md5-cache/kde-apps/mailcommon-16.08.3
deleted file mode 100644
index a86d9338f90b..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] dev-libs/libxslt sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.26.0:5 >=dev-qt/designer-5.6.1:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/mailcommon:4 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/mailcommon-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bf64060c8116165c93ea4f93464abe1a
diff --git a/metadata/md5-cache/kde-apps/mailimporter-16.08.3 b/metadata/md5-cache/kde-apps/mailimporter-16.08.3
deleted file mode 100644
index 15bc217442c8..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/mailimporter:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/mailimporter-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2e14e6857e0d42179b4f52f48d34f37d
diff --git a/metadata/md5-cache/kde-apps/marble-4.14.3 b/metadata/md5-cache/kde-apps/marble-4.14.3
index b298d73ba123..7b40bb0f753d 100644
--- a/metadata/md5-cache/kde-apps/marble-4.14.3
+++ b/metadata/md5-cache/kde-apps/marble-4.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=plasma? ( kde ) python? ( kde )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/marble-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=024dc25c57843973129e74962ed24d08
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-16.08.3 b/metadata/md5-cache/kde-apps/mbox-importer-16.08.3
deleted file mode 100644
index fddc495487b2..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/mailimporter-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kmail:4 >=kde-frameworks/kf-env-3 !kde-apps/mbox-importer:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=896a73ab55ea384185e449e5bc810aec
diff --git a/metadata/md5-cache/kde-apps/messagelib-16.08.3 b/metadata/md5-cache/kde-apps/messagelib-16.08.3
deleted file mode 100644
index 6e7562155440..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-16.08.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmbox-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=dev-qt/qtgui-5.7.0:5= >=dev-qt/qtnetwork-5.7.0:5 >=dev-qt/qtprintsupport-5.7.0:5 >=dev-qt/qtwebengine-5.7.0:5[widgets] >=dev-qt/qtwebkit-5.7.0:5 >=dev-qt/qtwidgets-5.7.0:5 >=dev-libs/grantlee-5.1.0:5 test? ( >=kde-apps/akonadi-contacts-16.08.3:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.7.0:5 ) >=dev-qt/qtcore-5.7.0:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/ktextwidgets-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/sonnet-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/akonadi-notes-16.08.3:5 >=kde-apps/gpgmepp-16.08.3:5 >=kde-apps/grantleetheme-16.08.3:5 >=kde-apps/incidenceeditor-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kdepim-apps-libs-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kldap-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmbox-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libgravatar-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/libkleo-16.08.3:5 >=dev-qt/qtgui-5.7.0:5= >=dev-qt/qtnetwork-5.7.0:5 >=dev-qt/qtprintsupport-5.7.0:5 >=dev-qt/qtwebengine-5.7.0:5[widgets] >=dev-qt/qtwebkit-5.7.0:5 >=dev-qt/qtwidgets-5.7.0:5 >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.04.50:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/messagelib:4 >=dev-qt/qtcore-5.7.0:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/messagelib-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07caf1ab5e370068a42f173d912fe6f6
diff --git a/metadata/md5-cache/kde-apps/nsplugins-16.04.3 b/metadata/md5-cache/kde-apps/nsplugins-16.04.3
index 580d92039660..14343652af1e 100644
--- a/metadata/md5-cache/kde-apps/nsplugins-16.04.3
+++ b/metadata/md5-cache/kde-apps/nsplugins-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-apps/konqueror-4.14.3:4[aqua=] !kde-base/nsplugins:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=206f6487ae46a57e28507e751430c984
diff --git a/metadata/md5-cache/kde-apps/nsplugins-16.08.3 b/metadata/md5-cache/kde-apps/nsplugins-16.08.3
index ea5b8ceab97c..de1f8a7d510f 100644
--- a/metadata/md5-cache/kde-apps/nsplugins-16.08.3
+++ b/metadata/md5-cache/kde-apps/nsplugins-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt >=kde-apps/konqueror-4.14.3:4[aqua=] !kde-base/nsplugins:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a9a4be1ace186aeab12fa16c3d799b04
diff --git a/metadata/md5-cache/kde-apps/okteta-4.14.3 b/metadata/md5-cache/kde-apps/okteta-4.14.3
index f02d9cc43118..2c167cef8700 100644
--- a/metadata/md5-cache/kde-apps/okteta-4.14.3
+++ b/metadata/md5-cache/kde-apps/okteta-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] !kde-base/okteta:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/okteta-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=77da34f02c29eadc580f47f19280e695
diff --git a/metadata/md5-cache/kde-apps/okular-16.04.3 b/metadata/md5-cache/kde-apps/okular-16.04.3
index 78c01c6eb5d6..178c30c643f6 100644
--- a/metadata/md5-cache/kde-apps/okular-16.04.3
+++ b/metadata/md5-cache/kde-apps/okular-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype media-libs/qimageblitz sys-libs/zlib chm? ( dev-libs
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/okular-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ca391eb0c37ed43e797751fbbf897dac
diff --git a/metadata/md5-cache/kde-apps/okular-16.08.3 b/metadata/md5-cache/kde-apps/okular-16.08.3
index fbd3a08723a8..38d3e581265f 100644
--- a/metadata/md5-cache/kde-apps/okular-16.08.3
+++ b/metadata/md5-cache/kde-apps/okular-16.08.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype media-libs/phonon[qt4] media-libs/qimageblitz sys-li
 RESTRICT=test
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/okular-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fbee94b634c63fc526d13ccc96d77c63
diff --git a/metadata/md5-cache/kde-apps/palapeli-16.04.3 b/metadata/md5-cache/kde-apps/palapeli-16.04.3
index 73d8f79cfaa5..3b03f77bfb86 100644
--- a/metadata/md5-cache/kde-apps/palapeli-16.04.3
+++ b/metadata/md5-cache/kde-apps/palapeli-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/palapeli:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/palapeli-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b5ae7ece29974e7006ed646c4869e102
diff --git a/metadata/md5-cache/kde-apps/palapeli-16.08.3 b/metadata/md5-cache/kde-apps/palapeli-16.08.3
index ceb6b634b1fe..d71cdc61f843 100644
--- a/metadata/md5-cache/kde-apps/palapeli-16.08.3
+++ b/metadata/md5-cache/kde-apps/palapeli-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/palapeli:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/palapeli-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=242bd86afac171f7b151fc3f25be1f54
diff --git a/metadata/md5-cache/kde-apps/palapeli-16.12.0 b/metadata/md5-cache/kde-apps/palapeli-16.12.0
index c40e36017e68..54cf6ad4d85c 100644
--- a/metadata/md5-cache/kde-apps/palapeli-16.12.0
+++ b/metadata/md5-cache/kde-apps/palapeli-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4[aqua=] !kde-base/palapeli:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/palapeli-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=242bd86afac171f7b151fc3f25be1f54
diff --git a/metadata/md5-cache/kde-apps/phonon-kde-16.04.3 b/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
index 74653b650d92..21361331c177 100644
--- a/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
+++ b/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) !kde-base/phonon-kde:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=692b7a9705cdeea67eec9eefe704a931
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-16.08.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-16.08.3
deleted file mode 100644
index 8dd593e9462f..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kalarmcal-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kidentitymanagement-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/mailcommon-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kmail:4 >=kde-frameworks/kf-env-3 !kde-apps/pim-data-exporter:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=956e94fab556074607dcd3657d827ea9
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-16.08.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-16.08.3
deleted file mode 100644
index f5d0bd34e321..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/libksieve-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/calendarsupport-16.08.3:5 >=kde-apps/kcalcore-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kmailtransport-16.08.3:5 >=kde-apps/libksieve-16.08.3:5 >=kde-apps/messagelib-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/pim-sieve-editor:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=73cf6687ec38a27e4a1765249d3f4b07
diff --git a/metadata/md5-cache/kde-apps/pim-storage-service-manager-16.08.3 b/metadata/md5-cache/kde-apps/pim-storage-service-manager-16.08.3
deleted file mode 100644
index 58d5d7aec73a..000000000000
--- a/metadata/md5-cache/kde-apps/pim-storage-service-manager-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to help with managing external and cloud data storage providers
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/knotifications-5.26.0:5 >=kde-frameworks/knotifyconfig-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=kde-apps/pimcommon-16.08.3:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 !kde-apps/kdepim:5 !kde-apps/kdepim-common-libs:4 >=kde-frameworks/kf-env-3 !kde-apps/pim-storage-service-manager:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ad943a451480dce7e628d624bfdc92bd
diff --git a/metadata/md5-cache/kde-apps/pimcommon-16.08.3 b/metadata/md5-cache/kde-apps/pimcommon-16.08.3
deleted file mode 100644
index f8de05c26abb..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kimap-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 dev-libs/libxslt sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.26.0:5 >=dev-qt/designer-5.6.1:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kjobwidgets-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kservice-5.26.0:5 >=kde-frameworks/kwallet-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-apps/akonadi-16.08.3:5 >=kde-apps/akonadi-contacts-16.08.3:5 >=kde-apps/akonadi-mime-16.08.3:5 >=kde-apps/kcontacts-16.08.3:5 >=kde-apps/kimap-16.08.3:5 >=kde-apps/kmime-16.08.3:5 >=kde-apps/kpimtextedit-16.08.3:5 >=kde-apps/libkdepim-16.08.3:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwebengine-5.6.1:5[widgets] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-3 !kde-apps/pimcommon:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/pimcommon-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=84c03826329e04014ac6c0534f4495a3
diff --git a/metadata/md5-cache/kde-apps/plasma-apps-16.04.3 b/metadata/md5-cache/kde-apps/plasma-apps-16.04.3
index bc30507309ba..fcdc66425c25 100644
--- a/metadata/md5-cache/kde-apps/plasma-apps-16.04.3
+++ b/metadata/md5-cache/kde-apps/plasma-apps-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/plasma-apps:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-baseapps-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=700288b51feed3036a73d997b45d5277
diff --git a/metadata/md5-cache/kde-apps/plasma-apps-16.08.3 b/metadata/md5-cache/kde-apps/plasma-apps-16.08.3
index 9ef0e20aa49a..51dd8af25e1f 100644
--- a/metadata/md5-cache/kde-apps/plasma-apps-16.08.3
+++ b/metadata/md5-cache/kde-apps/plasma-apps-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.14.3:4[aqua=] !kde-base/plasma-apps:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1dd907fe161e20ca25c93ee50d1f6714
diff --git a/metadata/md5-cache/kde-apps/plasma-runtime-16.04.3 b/metadata/md5-cache/kde-apps/plasma-runtime-16.04.3
index 7bea2dfb16b5..976b7224b756 100644
--- a/metadata/md5-cache/kde-apps/plasma-runtime-16.04.3
+++ b/metadata/md5-cache/kde-apps/plasma-runtime-16.04.3
@@ -10,5 +10,5 @@ RDEPEND=kde-frameworks/kactivities:4 !kde-base/plasma-runtime:4 kde-frameworks/o
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=05d7210276f3b52548661497ed9b9327
diff --git a/metadata/md5-cache/kde-apps/renamedlg-plugins-16.04.3 b/metadata/md5-cache/kde-apps/renamedlg-plugins-16.04.3
index 386f2fca2e81..c0059f47caf9 100644
--- a/metadata/md5-cache/kde-apps/renamedlg-plugins-16.04.3
+++ b/metadata/md5-cache/kde-apps/renamedlg-plugins-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/renamedlg-plugins:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=40af55d76ae7e715522eba71a140a6a6
diff --git a/metadata/md5-cache/kde-apps/solid-runtime-16.04.3 b/metadata/md5-cache/kde-apps/solid-runtime-16.04.3
index ecfc96061ff3..2e179c0178e0 100644
--- a/metadata/md5-cache/kde-apps/solid-runtime-16.04.3
+++ b/metadata/md5-cache/kde-apps/solid-runtime-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( || ( kde-plasma/bluedevil:4 kde-plasma/bluedevil:5 ) ) networkmanager? ( || ( kde-plasma/plasma-nm:4 kde-plasma/plasma-nm:5 ) ) !kde-base/solid-runtime:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a4f886823a8f9524b7fb6f65e6257e23
diff --git a/metadata/md5-cache/kde-apps/svgpart-16.04.3 b/metadata/md5-cache/kde-apps/svgpart-16.04.3
index fea5e53f2352..caefd3dfb17a 100644
--- a/metadata/md5-cache/kde-apps/svgpart-16.04.3
+++ b/metadata/md5-cache/kde-apps/svgpart-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/svgpart:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/svgpart-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=81730d6b8e661ec078fb51cecf9539b7
diff --git a/metadata/md5-cache/kde-apps/svgpart-16.08.3 b/metadata/md5-cache/kde-apps/svgpart-16.08.3
index 9c74a233538c..86f7df4a6916 100644
--- a/metadata/md5-cache/kde-apps/svgpart-16.08.3
+++ b/metadata/md5-cache/kde-apps/svgpart-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/svgpart:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/svgpart-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80330e35e0c56783c5b11ec757a02af5
diff --git a/metadata/md5-cache/kde-apps/sweeper-16.04.3 b/metadata/md5-cache/kde-apps/sweeper-16.04.3
index 66fa5229b655..66040a37d698 100644
--- a/metadata/md5-cache/kde-apps/sweeper-16.04.3
+++ b/metadata/md5-cache/kde-apps/sweeper-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/sweeper:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/sweeper-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b05f4466c1c597aaed1c72bf6c69e77c
diff --git a/metadata/md5-cache/kde-apps/sweeper-16.08.3 b/metadata/md5-cache/kde-apps/sweeper-16.08.3
index 8791c3cbaa16..0bc6e4cf96cf 100644
--- a/metadata/md5-cache/kde-apps/sweeper-16.08.3
+++ b/metadata/md5-cache/kde-apps/sweeper-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/sweeper:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/sweeper-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4540a8826d53b9703a47004c62a3946a
diff --git a/metadata/md5-cache/kde-apps/sweeper-16.12.0 b/metadata/md5-cache/kde-apps/sweeper-16.12.0
index cc0768137e91..87a3b3cf04c3 100644
--- a/metadata/md5-cache/kde-apps/sweeper-16.12.0
+++ b/metadata/md5-cache/kde-apps/sweeper-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/sweeper:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/sweeper-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4540a8826d53b9703a47004c62a3946a
diff --git a/metadata/md5-cache/kde-apps/syndication-16.08.3 b/metadata/md5-cache/kde-apps/syndication-16.08.3
deleted file mode 100644
index e9841b7e86e1..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-16.08.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !kde-apps/syndication:4 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/syndication-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=56ff127156e65d923c84a7ee5491a737
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.04.3
index 27f998987ea4..e146eb793827 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.04.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/zeroconf-ioslave:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/zeroconf-ioslave-16.04.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=66a15a464f4278d011ed2110b8f0d003
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.08.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.08.3
index 7de0f44363f2..a94521d36664 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.08.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/zeroconf-ioslave:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.08
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/zeroconf-ioslave-16.08.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=829aa24156684c598d8ee526a8391076
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.12.0 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.12.0
index 7e08324d04af..8e898a0bb906 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.12.0
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-16.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/zeroconf-ioslave:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/16.12
 SRC_URI=mirror://kde/stable/applications/16.12.0/src/zeroconf-ioslave-16.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=829aa24156684c598d8ee526a8391076
diff --git a/metadata/md5-cache/kde-base/katepart-4.14.3 b/metadata/md5-cache/kde-base/katepart-4.14.3
index 97d50c013b4b..2838928f45c6 100644
--- a/metadata/md5-cache/kde-base/katepart-4.14.3
+++ b/metadata/md5-cache/kde-base/katepart-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kate-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ec6c58f1efa4ca1cd95945dc66971f5c
diff --git a/metadata/md5-cache/kde-base/kde-env-4.14.3 b/metadata/md5-cache/kde-base/kde-env-4.14.3
index abbf17a3cbae..97822ede4801 100644
--- a/metadata/md5-cache/kde-base/kde-env-4.14.3
+++ b/metadata/md5-cache/kde-base/kde-env-4.14.3
@@ -7,5 +7,5 @@ IUSE=aqua
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=4/4.14
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e4ff0e6c487eaec7597896e589efd3e3
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.14.24 b/metadata/md5-cache/kde-base/kdelibs-4.14.24
index f032a7556080..c91d2c986eae 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.14.24
+++ b/metadata/md5-cache/kde-base/kdelibs-4.14.24
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=69693cf5bf19823b8ecbb9d15363bb03
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.14.26 b/metadata/md5-cache/kde-base/kdelibs-4.14.27
similarity index 95%
rename from metadata/md5-cache/kde-base/kdelibs-4.14.26
rename to metadata/md5-cache/kde-base/kdelibs-4.14.27
index df9acfd75860..888511174642 100644
--- a/metadata/md5-cache/kde-base/kdelibs-4.14.26
+++ b/metadata/md5-cache/kde-base/kdelibs-4.14.27
@@ -11,6 +11,6 @@ RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
-SRC_URI=mirror://kde/stable/applications/16.08.3/src/kdelibs-4.14.26.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=578da17712a5653287d6437b9ef54eca
+SRC_URI=mirror://kde/stable/applications/16.12.0/src/kdelibs-4.14.27.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=59a6da8f2a3956ff08fa1f0e546df348
diff --git a/metadata/md5-cache/kde-base/krosspython-4.14.3 b/metadata/md5-cache/kde-base/krosspython-4.14.3
index 047741c70db6..474f03c49739 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.14.3
+++ b/metadata/md5-cache/kde-base/krosspython-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ebcdc036ebe0ce92a5e5bd69238cd706
diff --git a/metadata/md5-cache/kde-base/pykde4-4.14.3-r1 b/metadata/md5-cache/kde-base/pykde4-4.14.3-r1
index d8e31f22a8a2..365d5c6d31ed 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/pykde4-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/pykde4-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7d5d044e33dfc69e47656db0d9745bb1
diff --git a/metadata/md5-cache/kde-frameworks/baloo-4.14.3 b/metadata/md5-cache/kde-frameworks/baloo-4.14.3
index 58b167bfab8d..e3acb063903b 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-4.14.3
+++ b/metadata/md5-cache/kde-frameworks/baloo-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4[aqua=] dev-libs/qjson =dev-libs/xapian-1.
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/baloo-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f4b801185506eae04c8b6b041228205
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-4.13.3-r2 b/metadata/md5-cache/kde-frameworks/kactivities-4.13.3-r2
index b516a8257e2a..6f9dd0802a57 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-4.13.3-r2
+++ b/metadata/md5-cache/kde-frameworks/kactivities-4.13.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kactivitymanagerd:5 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/applications/4.13.3/src/kactivities-4.13.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=972571e576893c212fa0379cb45f6df5
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-4.14.3 b/metadata/md5-cache/kde-frameworks/kfilemetadata-4.14.3
index 6755ff0e8190..6410ee535230 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-4.14.3
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) mobi? ( >=kde-apps/kdegraphics-mobipocket-4.14.3:4[aqua=] ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.14.3/src/kfilemetadata-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dcf5b129a224796860bb5e918b9db944
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3 b/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
index b743e3e3059b..4736eac7863f 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86
 LICENSE=LGPL-3
 SLOT=4/4.14
 SRC_URI=!sources? ( https://dev.gentoo.org/~kensington/distfiles/oxygen-icons-4.14.3.repacked.tar.xz ) sources? ( mirror://kde/stable/4.14.3/src/oxygen-icons-4.14.3.tar.xz )
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1f21b54745c9fd9e6b56c7be0cd218aa
diff --git a/metadata/md5-cache/kde-frameworks/prison-1.1.1 b/metadata/md5-cache/kde-frameworks/prison-1.1.1
index fe2326cc76ce..d818849f8f08 100644
--- a/metadata/md5-cache/kde-frameworks/prison-1.1.1
+++ b/metadata/md5-cache/kde-frameworks/prison-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/qrencode media-libs/libdmtx kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/prison/1.1.1/src/prison-1.1.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=92a6fde046a4980cb12536e518051daf
diff --git a/metadata/md5-cache/kde-misc/about-distro-1.1.0 b/metadata/md5-cache/kde-misc/about-distro-1.1.0
index 4a52be59a399..b206ec7cb6cf 100644
--- a/metadata/md5-cache/kde-misc/about-distro-1.1.0
+++ b/metadata/md5-cache/kde-misc/about-distro-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/lsb-release kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://www.gentoo.org/images/glogo-small.png mirror://kde/stable/about-distro/1.1.0/src/about-distro-1.1.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=33bb584ff876d5b4d40bfce49a9f0beb
diff --git a/metadata/md5-cache/kde-misc/adjustableclock-4.1.4 b/metadata/md5-cache/kde-misc/adjustableclock-4.1.4
index a7bdd346eb2a..b3ebe900d8db 100644
--- a/metadata/md5-cache/kde-misc/adjustableclock-4.1.4
+++ b/metadata/md5-cache/kde-misc/adjustableclock-4.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libplasmaclock:4 kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/92825-adjustableclock-4.1.4.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=73ed0c021e46f6f4e38fbec23458355b
diff --git a/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20131023 b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20131023
index 39008c23834c..64e6c26c2248 100644
--- a/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20131023
+++ b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20131023
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/akonadi-git-resource-0_p20131023.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=229b7dba4f4dfb4c8a73bf6fffca5e54
diff --git a/metadata/md5-cache/kde-misc/baloo-kcmadv-2014.04.27 b/metadata/md5-cache/kde-misc/baloo-kcmadv-2014.04.27
index 49ded1d91de0..d3d879b40936 100644
--- a/metadata/md5-cache/kde-misc/baloo-kcmadv-2014.04.27
+++ b/metadata/md5-cache/kde-misc/baloo-kcmadv-2014.04.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/qjson dev-libs/xapian kde-frameworks/baloo:4[-minimal] kde-frameworks/kfilemetadata:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/baloo-kcmadv-2014.04.27.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0e1a41051f03e9bd28db7df8ceb4006b
diff --git a/metadata/md5-cache/kde-misc/basket-1.81 b/metadata/md5-cache/kde-misc/basket-1.81
index 0ac59f4ba33c..8d8777529d97 100644
--- a/metadata/md5-cache/kde-misc/basket-1.81
+++ b/metadata/md5-cache/kde-misc/basket-1.81
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4:4[aqua=] media-libs/qimageblitz x11-libs/libX11 crypt? ( >=app-crypt/gpgme-1.0 ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://basket.kde.org/downloads/basket-1.81.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=676df82f852bd2d660965c70f814a36d
diff --git a/metadata/md5-cache/kde-misc/bkodama-0.3.1 b/metadata/md5-cache/kde-misc/bkodama-0.3.1
index 9ab17eca9c00..c2b7f0e5ffa0 100644
--- a/metadata/md5-cache/kde-misc/bkodama-0.3.1
+++ b/metadata/md5-cache/kde-misc/bkodama-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/106528-bkodama-0.3.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=62f7466fb64fe7200adc72e39107396f
diff --git a/metadata/md5-cache/kde-misc/chromi-0.2_p20141209 b/metadata/md5-cache/kde-misc/chromi-0.2_p20141209
index 0f6e86f50084..13a982072cd3 100644
--- a/metadata/md5-cache/kde-misc/chromi-0.2_p20141209
+++ b/metadata/md5-cache/kde-misc/chromi-0.2_p20141209
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kde-plasma/kwin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwin-deco-chromi-0.2_p20141209.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4569965313acb852b1ad8f56e62bd3a
diff --git a/metadata/md5-cache/kde-misc/colibri-0.3.0 b/metadata/md5-cache/kde-misc/colibri-0.3.0
index 34e1652b6213..8c7b3abe099c 100644
--- a/metadata/md5-cache/kde-misc/colibri-0.3.0
+++ b/metadata/md5-cache/kde-misc/colibri-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/colibri/colibri-0.3.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=848d011f5febf24dee9bddd31b23d1fd
diff --git a/metadata/md5-cache/kde-misc/commandwatch-0.1.1 b/metadata/md5-cache/kde-misc/commandwatch-0.1.1
index c3f4c2bd305a..c8454cabed4f 100644
--- a/metadata/md5-cache/kde-misc/commandwatch-0.1.1
+++ b/metadata/md5-cache/kde-misc/commandwatch-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/84523-commandwatch-0.1.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a62cbf972954be1e81e542d3c853ca86
diff --git a/metadata/md5-cache/kde-misc/cpuload-0.3.2 b/metadata/md5-cache/kde-misc/cpuload-0.3.2
index c10b1386ae3d..d646885bf2c6 100644
--- a/metadata/md5-cache/kde-misc/cpuload-0.3.2
+++ b/metadata/md5-cache/kde-misc/cpuload-0.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/86628-cpuload-0.3.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4835c22e9b58f2e8549d06b2d5152b81
diff --git a/metadata/md5-cache/kde-misc/customizable-weather-1.12.1 b/metadata/md5-cache/kde-misc/customizable-weather-1.12.1
index 777bbf201534..36f70c692a3a 100644
--- a/metadata/md5-cache/kde-misc/customizable-weather-1.12.1
+++ b/metadata/md5-cache/kde-misc/customizable-weather-1.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.12.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d2e02fe580fbc032d588ed11e391e87
diff --git a/metadata/md5-cache/kde-misc/drop2ftp-0.6 b/metadata/md5-cache/kde-misc/drop2ftp-0.6
index 256ec321dd7c..ea961b086516 100644
--- a/metadata/md5-cache/kde-misc/drop2ftp-0.6
+++ b/metadata/md5-cache/kde-misc/drop2ftp-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/97281-drop2ftp-0.6.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=efefcb0c89257df7aff85421f9d948d1
diff --git a/metadata/md5-cache/kde-misc/emerging-plasmoid-1.0.3 b/metadata/md5-cache/kde-misc/emerging-plasmoid-1.0.3
index f9ad02c62a37..915afb758607 100644
--- a/metadata/md5-cache/kde-misc/emerging-plasmoid-1.0.3
+++ b/metadata/md5-cache/kde-misc/emerging-plasmoid-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Date-Manip kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://github/leonardo2d/emerging-plasmoid/emerging-plasmoid-1.0.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5be9e214beb56b2bbc3ed9ae12a6266a
diff --git a/metadata/md5-cache/kde-misc/eventlist-0.6-r1 b/metadata/md5-cache/kde-misc/eventlist-0.6-r1
index 1e9340e0862d..a6ea17916a68 100644
--- a/metadata/md5-cache/kde-misc/eventlist-0.6-r1
+++ b/metadata/md5-cache/kde-misc/eventlist-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-common-libs-4.4:4[aqua=] >=kde-apps/kdepimlibs-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2f8b5dcadcca8697bd3bd3c2cb4d911
diff --git a/metadata/md5-cache/kde-misc/eyesaver-0.4 b/metadata/md5-cache/kde-misc/eyesaver-0.4
index acb3c46ab00f..43d17a79a2ed 100644
--- a/metadata/md5-cache/kde-misc/eyesaver-0.4
+++ b/metadata/md5-cache/kde-misc/eyesaver-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=media-libs/phonon[qt4] kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/89989-eyesaver-0.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=afa56f94db3584c78accabb0db484ed1
diff --git a/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1 b/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
index 9b1803e3e53a..ca23dec13eda 100644
--- a/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
+++ b/metadata/md5-cache/kde-misc/fancytasks-1.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_et(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fr(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_km(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_nds(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/99737-fancytasks-1.1.2.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ebce6ed80c97fe41cdfaa8ab918c14f
diff --git a/metadata/md5-cache/kde-misc/geekclock-1.0 b/metadata/md5-cache/kde-misc/geekclock-1.0
index 4a8fd73cec51..789fe6625fbb 100644
--- a/metadata/md5-cache/kde-misc/geekclock-1.0
+++ b/metadata/md5-cache/kde-misc/geekclock-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://w2f2.com/projects/geekclock/geek-clock-plasmoid-1.0-src.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=717af3999d1e6a200feb8da52b05cb37
diff --git a/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4 b/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
index fa20a94228aa..4944c9465427 100644
--- a/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
+++ b/metadata/md5-cache/kde-misc/gx-mail-notify-0.4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/99617-gx_mail_notify-0.4.4.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=37a8d4ad08370329134a8b3cfc5d29c7
diff --git a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1 b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
index ac15ef077f16..167deea36d86 100644
--- a/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
+++ b/metadata/md5-cache/kde-misc/hdaps_monitor-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 app-laptop/hdapsd kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/103481-hdaps_monitor-0.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9864e3849cc15a451750994c07d70385
diff --git a/metadata/md5-cache/kde-misc/homerun-1.2.5 b/metadata/md5-cache/kde-misc/homerun-1.2.5
index 03834917d577..03d057c2de56 100644
--- a/metadata/md5-cache/kde-misc/homerun-1.2.5
+++ b/metadata/md5-cache/kde-misc/homerun-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/libkonq-4.4:4[aqua=] kde-plasma/libkworkspace:4 kde-plasma/pl
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/homerun/src/homerun-1.2.5.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c353f4b467485bf5a31c00b940d7978e
diff --git a/metadata/md5-cache/kde-misc/kbiff-4.0 b/metadata/md5-cache/kde-misc/kbiff-4.0
index e8c0a60c2994..5d09b5805118 100644
--- a/metadata/md5-cache/kde-misc/kbiff-4.0
+++ b/metadata/md5-cache/kde-misc/kbiff-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kbiff/kbiff/kbiff-4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8cdc9fa6dc7ac9c5cc5d46a98dd5384b
diff --git a/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845 b/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
index ed50b19a7743..48b9f36d6e93 100644
--- a/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
+++ b/metadata/md5-cache/kde-misc/kbstateapplet-0_p1268845
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kbstateapplet-0_p1268845.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0f30f6d63566e99bd969a36593ee8a14
diff --git a/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r2 b/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r2
index 446026cb6930..3a41e99305de 100644
--- a/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r2
+++ b/metadata/md5-cache/kde-misc/kcm-grub2-0.6.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=hwinfo? ( sys-apps/hwinfo ) imagemagick? ( media-gfx/imagemagick ) >=kde-apps/kcmshell-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kcm-grub2/0.6.4/kcm-grub2-0.6.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2b62bb2932ff31c391f8b7d98b7c4322
diff --git a/metadata/md5-cache/kde-misc/kcm-touchpad-1.1 b/metadata/md5-cache/kde-misc/kcm-touchpad-1.1
index 4b9ef2b4a8a2..13457f43c177 100644
--- a/metadata/md5-cache/kde-misc/kcm-touchpad-1.1
+++ b/metadata/md5-cache/kde-misc/kcm-touchpad-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-drivers/xf86-input-synaptics x11-libs/libxcb kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://quickgit.kde.org/?p=kcm-touchpad.git&a=snapshot&t=v1.1 -> kcm-touchpad-1.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e072c1aa8ba4a6187e0e226a0ed73c9a
diff --git a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1 b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
index c301ffffbcdc..e3f4734ab71d 100644
--- a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
+++ b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://craigd.wikispaces.com/file/view/kcm_ufw-0.4.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=428f1ca25e774a8053baec13f855c6cb
diff --git a/metadata/md5-cache/kde-misc/kcollectd-0.9-r1 b/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
index 43170b6f07ca..ad9c62e05392 100644
--- a/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
+++ b/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost net-analyzer/rrdtool || ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd/kcollectd-0.9.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac4d3a2b641a581e05e44d9029a143d8
diff --git a/metadata/md5-cache/kde-misc/kcometen4-1.0.8 b/metadata/md5-cache/kde-misc/kcometen4-1.0.8
index 033a604b2640..a241b4c25328 100644
--- a/metadata/md5-cache/kde-misc/kcometen4-1.0.8
+++ b/metadata/md5-cache/kde-misc/kcometen4-1.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kscreensaver:4 media-libs/libart_lgpl virtual/glu virtual/opengl kde-frameworks/oxygen-icons >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/87586-kcometen4-1.0.8.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=24ed4200f068cff57e07aa5dcfb84d54
diff --git a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1 b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
index fce2bcff611c..bd46359c4c62 100644
--- a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
+++ b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2 LGPL-2
 RDEPEND=app-admin/sudo kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_id? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_id(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tl(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://launchpad.net/kdesudo/3.x/3.4.2.4/+download/kdesudo-3.4.2.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d3498f3d8bb7c402b780cf253fba7349
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2 b/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
index 674214d992a3..f786baac0d1c 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.97-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] )
 RESTRICT=!kde? ( test )
 SLOT=4
 SRC_URI=mirror://sourceforge/kdiff3/kdiff3-0.9.97.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2976556e339108a4d39b58033d16f83e
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.98-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98-r1
index 53d62f1f3a72..0c8806010015 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.98-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.98-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=kde? ( qt4 ) ^^ ( qt4 qt5 )
 RESTRICT=!kde? ( test )
 SLOT=4
 SRC_URI=mirror://sourceforge/kdiff3/kdiff3-0.9.98.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=afc7e727ce3a2c9106315c647621bef3
diff --git a/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8 b/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
index 36ddf5720870..982379335561 100644
--- a/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
+++ b/metadata/md5-cache/kde-misc/kdmthemegenerator-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kdm:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/102760-KdmThemeGenerator.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8daded08484293165a4a9f5c5ced243e
diff --git a/metadata/md5-cache/kde-misc/kepas-0.9.3 b/metadata/md5-cache/kde-misc/kepas-0.9.3
index 8b718d0f3769..92a4fde28060 100644
--- a/metadata/md5-cache/kde-misc/kepas-0.9.3
+++ b/metadata/md5-cache/kde-misc/kepas-0.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kde-plasma/plasma-workspace:4 oscar? ( >=kde-apps/kopete-4.4:4[aqua=,oscar] ) zeroconf? ( >=kde-apps/zeroconf-ioslave-4.4:4[aqua=] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kepas/kepas-0.9.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=77e986a83a4774fa6d383e25b50b1b04
diff --git a/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5 b/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
index 578dce2e96a4..a8054cfb5c9f 100644
--- a/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
+++ b/metadata/md5-cache/kde-misc/kgrubeditor-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( <sys-boot/grub-1 sys-boot/grub-static ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kgrubeditor/KGRUBEditor-0.8.5-src.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2afb2aa71588be663e7cbb8738c32bf2
diff --git a/metadata/md5-cache/kde-misc/kio-ftps-0.2 b/metadata/md5-cache/kde-misc/kio-ftps-0.2
index abebce0440a3..3631550a087f 100644
--- a/metadata/md5-cache/kde-misc/kio-ftps-0.2
+++ b/metadata/md5-cache/kde-misc/kio-ftps-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-apps/konqueror-4.4:4[aqua=] >=kde-apps/dolphin-4.4:4[aqua=] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/kio-ftps-0.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0582e70ac93832e49b8f32b442f24bdd
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3
index 34d8717c8105..2fef862383f7 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/mlocate kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6963f15f07f32c2c5795f9885a62ac6
diff --git a/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20150403 b/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20150403
index dac5af9782ec..f4f8c5443c1a 100644
--- a/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20150403
+++ b/metadata/md5-cache/kde-misc/kio-mtp-0.75_p20150403
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libmtp-1.1.3 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://quickgit.kde.org/?p=kio-mtp.git&a=snapshot&h=d91d9898dcd81fa1c472474a0d6af1c6c1063ce0&fmt=tgz -> kio-mtp-0.75_p20150403.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=82c66bea21cb35e321bb5c1372fe07bf
diff --git a/metadata/md5-cache/kde-misc/kio-slp-0_p20120621 b/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
index 406ba177540d..ce0deef54c75 100644
--- a/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
+++ b/metadata/md5-cache/kde-misc/kio-slp-0_p20120621
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=net-libs/openslp kde-frameworks/oxygen-icons opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~creffett/kio-slp-0_p20120621.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1f8ba6e8503f103f127677f6502493d6
diff --git a/metadata/md5-cache/kde-misc/kio_gopher-0.1.4 b/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
index 0cafa672968f..73d2b481494c 100644
--- a/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
+++ b/metadata/md5-cache/kde-misc/kio_gopher-0.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/konqueror-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ka(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_rw? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_rw(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/extragear/kio-gopher-0.1.4.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eb849ebd51bd0690bb6584f36325185d
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.0.2 b/metadata/md5-cache/kde-misc/kolor-manager-1.0.2
index ac79420435d0..5e78c82798ef 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.0.2
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/oyranos-0.9.5 media-libs/libXcm x11-libs/libX11 x11-libs/libXrandr kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/kolor-manager-1.0.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=15f53d88f02137ef0a5bfb63958b6e6b
diff --git a/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1 b/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
index 359797ef7d32..a9db26ee5a78 100644
--- a/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
+++ b/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 kde-frameworks/oxygen-icons >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://konstruktor.influx.kr/konstruktor-0.9-beta1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f0f81e9a8edb4c05b3aaf92cb548122
diff --git a/metadata/md5-cache/kde-misc/kookie-0.1.1 b/metadata/md5-cache/kde-misc/kookie-0.1.1
index ab407be5542f..4c4b45a9778b 100644
--- a/metadata/md5-cache/kde-misc/kookie-0.1.1
+++ b/metadata/md5-cache/kde-misc/kookie-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kookie/kookie-0.1.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc2e6a411f91e07df44036918a36106e
diff --git a/metadata/md5-cache/kde-misc/kopete-antispam-0.5 b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
index 7111f5db6958..fead39d9d857 100644
--- a/metadata/md5-cache/kde-misc/kopete-antispam-0.5
+++ b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kopete-4.4:4[aqua=] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kopeteantispam/kopete-antispam-kde4-0.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=203e5dfbed65aa9152c7fa20a70a7579
diff --git a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50 b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
index 7c24224a5c49..42e67d18b0b1 100644
--- a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
+++ b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kopete-4.4:4[aqua=] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/100537-kopete-thinklight-0.50.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac88b5e0d14bb04a51a1c29fe4b685df
diff --git a/metadata/md5-cache/kde-misc/kover-6 b/metadata/md5-cache/kde-misc/kover-6
index 2875d98ebf98..9b3e84178604 100644
--- a/metadata/md5-cache/kde-misc/kover-6
+++ b/metadata/md5-cache/kde-misc/kover-6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcdio-paranoia media-libs/libcddb kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_no? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_no(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://lisas.de/kover/kover-6.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=709e6f3807cc4b1b2762a621335b2572
diff --git a/metadata/md5-cache/kde-misc/kprayertime-4.01 b/metadata/md5-cache/kde-misc/kprayertime-4.01
index f6cc342c2ade..fe9f7c65f2ce 100644
--- a/metadata/md5-cache/kde-misc/kprayertime-4.01
+++ b/metadata/md5-cache/kde-misc/kprayertime-4.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kprayertime/kprayertime4.01.src.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cfb57ef8cb2aa7150ed12c056e9fa137
diff --git a/metadata/md5-cache/kde-misc/kraidmonitor-0.5 b/metadata/md5-cache/kde-misc/kraidmonitor-0.5
index 0b38314e6d73..8349b5587b62 100644
--- a/metadata/md5-cache/kde-misc/kraidmonitor-0.5
+++ b/metadata/md5-cache/kde-misc/kraidmonitor-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/68553-kraidmonitor_0.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=167f6e6f40636560a61d027ba113217d
diff --git a/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1 b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
index ff1dc0383a03..b393dc5bba5b 100644
--- a/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
+++ b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://binro.org/krcstat-0.7.6.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2d2cd5eef43d9b8a02c81ceb8d6a150
diff --git a/metadata/md5-cache/kde-misc/krecipes-2.0.0 b/metadata/md5-cache/kde-misc/krecipes-2.0.0
index b34015c74629..46c3fe25a802 100644
--- a/metadata/md5-cache/kde-misc/krecipes-2.0.0
+++ b/metadata/md5-cache/kde-misc/krecipes-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-db/sqlite:3 dev-libs/libxml2 dev-libs/libxslt media-libs/qimageblitz kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=mirror://kde/stable/krecipes/2.0.0/src/krecipes-2.0.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef6739c702d9690100c0b3fc35b5c3b5
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9-r3 b/metadata/md5-cache/kde-misc/krename-4.0.9-r3
index 41cf6eb53e03..9186435a6278 100644
--- a/metadata/md5-cache/kde-misc/krename-4.0.9-r3
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( >=media-gfx/exiv2-0.13:= ) pdf? ( >=app-text/podofo-0.8 ) taglib? ( >=media-libs/taglib-1.5 ) truetype? ( media-libs/freetype:2 ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krename/krename-4.0.9.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac37a7b3bb644776addcbd68dd35e7a7
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9-r4 b/metadata/md5-cache/kde-misc/krename-4.0.9-r4
index 7c539ccb06a5..29f81aaebd35 100644
--- a/metadata/md5-cache/kde-misc/krename-4.0.9-r4
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=exif? ( >=media-gfx/exiv2-0.13:= ) pdf? ( >=app-text/podofo-0.8 ) taglib? ( >=media-libs/taglib-1.5 ) truetype? ( media-libs/freetype:2 ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krename/krename-4.0.9.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=62d7f567c7a9a67f3ded7c9e4e18a2f5
diff --git a/metadata/md5-cache/kde-misc/krunner-googletranslate-0.1 b/metadata/md5-cache/kde-misc/krunner-googletranslate-0.1
index 17ea8f75ef4f..c03e3750dd86 100644
--- a/metadata/md5-cache/kde-misc/krunner-googletranslate-0.1
+++ b/metadata/md5-cache/kde-misc/krunner-googletranslate-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/qjson kde-plasma/libkworkspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://gt.kani.hu/distfiles/krunner/krunner-googletranslate-0.1.tbz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=841a7d28b2d73ec72360714c97548a25
diff --git a/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4 b/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
index f9fa4d2e808a..367c8743f66a 100644
--- a/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
+++ b/metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/libkworkspace:4 >=kde-apps/kopete-4.4:4[aqua=] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/105263-krunner-kopete-contacts-0.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e9c89413dfa8d8ff92333b34db7d05b
diff --git a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r2 b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r2
index c5ead0a2a515..c1c579d3882b 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r2
+++ b/metadata/md5-cache/kde-misc/krusader-2.4.0_beta3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkonq-4.4:4[aqua=] sys-libs/zlib bookmarks? ( >=kde-apps/keditbookmarks-4.4:4[aqua=] ) >=kde-apps/kdebase-kioslaves-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/krusader/krusader-2.4.0-beta3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=03eaba57da8e475576ea920ff7754078
diff --git a/metadata/md5-cache/kde-misc/kshutdown-3.2 b/metadata/md5-cache/kde-misc/kshutdown-3.2
index b3d813d1a457..739ef3b98c1b 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-3.2
+++ b/metadata/md5-cache/kde-misc/kshutdown-3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ar(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_bg(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_it(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sk(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-3.2.zip
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c947991ba000d16d194b95df181f0f45
diff --git a/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1 b/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
index 7342d8594910..5d6c39cb91e7 100644
--- a/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
+++ b/metadata/md5-cache/kde-misc/ktrafficanalyzer-0.5.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/ktrafficanalyze/KTrafficAnalyzer-0.5.4.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=398bdab40571926480a145e0c904e1d1
diff --git a/metadata/md5-cache/kde-misc/kvkbd-0.6-r1 b/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
index b8b4cb6ce24b..c28a6677c9d9 100644
--- a/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
+++ b/metadata/md5-cache/kde-misc/kvkbd-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/94374-kvkbd-0.6.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fbeddd54e7bea43756700be4676b29b9
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.3.4-r1 b/metadata/md5-cache/kde-misc/kwebkitpart-1.3.4-r1
index b5f4339a6e5f..7246d6ff9969 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.3.4-r1
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwebkitpart-1.3.4.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6692b9b8d6079dff69d11ae267c7a544
diff --git a/metadata/md5-cache/kde-misc/miniplayer-2.5-r1 b/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
index 8b567d6b8004..f78cc82fec93 100644
--- a/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
+++ b/metadata/md5-cache/kde-misc/miniplayer-2.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/95501-miniplayer-2.5.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53b38de303b64255d2e8e40bdcae4e9e
diff --git a/metadata/md5-cache/kde-misc/nightmode-0.3-r1 b/metadata/md5-cache/kde-misc/nightmode-0.3-r1
index 48c3687207ee..c53a89a8a7cd 100644
--- a/metadata/md5-cache/kde-misc/nightmode-0.3-r1
+++ b/metadata/md5-cache/kde-misc/nightmode-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kwin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://static.davidedmundson.co.uk/nightmode_0.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5c614d1eaa2582bd65c1c2b751fed815
diff --git a/metadata/md5-cache/kde-misc/nvdevmon-0.1.2 b/metadata/md5-cache/kde-misc/nvdevmon-0.1.2
index e347735d5823..be1c9e19d8ad 100644
--- a/metadata/md5-cache/kde-misc/nvdevmon-0.1.2
+++ b/metadata/md5-cache/kde-misc/nvdevmon-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-drivers/nvidia-drivers kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/148658-NVidiaDeviceMonitor-0.1.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=866d1adb369730a4054fbd5039a66851
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r2 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r2
index 70f921bf8d26..f8612d3288f6 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r2
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c8f8994ce5d0dd5b6eadbea6186a2cab
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1 b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
index a4ab5deab2bb..c97a1c1220e2 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
+++ b/metadata/md5-cache/kde-misc/plasma-applet-daisy-0.0.4.26-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/libtaskmanager:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_bs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_el(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sr(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_tr(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://cdlszm.org/downloads/plasma-applet-daisy-0.0.4.26.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ae54a26f4ba8d616f1131113258fb920
diff --git a/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1 b/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
index 048e6ca238ce..5ab721469f82 100644
--- a/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
+++ b/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentooexperimental.org/~hwoarang/projects/plasma-emergelog/plasma-emergelog-0.0.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1e0ac787e3e3db2eb27db2710faa8636
diff --git a/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020 b/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
index 6e114152411e..ea25ebce9d50 100644
--- a/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
+++ b/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=] >=kde-apps/kdepimlibs-4.4:4[aqua=] kde-apps/akonadi:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 >=kde-apps/kdepim-runtime-4.4:4[aqua=] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~creffett/distfiles/plasma-lionmail-0_p20121020.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b7d9d43a97c088940f20fa94d1ecfccf
diff --git a/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.3 b/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.3
index e5e44d23b4dd..2457f53c2da2 100644
--- a/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.3
+++ b/metadata/md5-cache/kde-misc/plasma-mpd-nowplaying-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/132350-mpdnowplaying-0.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cf69f99929698a99b6c7ce95341d86d3
diff --git a/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1 b/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
index ba4fa87b3ca3..b00d8c8d5149 100644
--- a/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
+++ b/metadata/md5-cache/kde-misc/plasma-network-status-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/pa-net-stat/plasma-network-status-0.1.1-Source.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=88d6351b281e0834ccd8f75cc755dd40
diff --git a/metadata/md5-cache/kde-misc/plasma-photooftheday-2.1.1 b/metadata/md5-cache/kde-misc/plasma-photooftheday-2.1.1
index 48f79da870b1..3aaf7bc4dd24 100644
--- a/metadata/md5-cache/kde-misc/plasma-photooftheday-2.1.1
+++ b/metadata/md5-cache/kde-misc/plasma-photooftheday-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/104631-photo-of-the-day.tar.gz -> 104631-photo-of-the-day-2.1.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=682e3d23a39fcbe96bba707a07a64307
diff --git a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.2.0 b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.2.0
index 7c128a9cb4ca..665c98de0c76 100644
--- a/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.2.0
+++ b/metadata/md5-cache/kde-misc/plasma-widget-menubar-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdbusmenu-qt-0.6.0[qt4(+)] >=dev-libs/qjson-0.7.1 !kde-misc
 RESTRICT=test
 SLOT=4
 SRC_URI=https://launchpad.net/plasma-widget-menubar/trunk/0.2.0/+download/plasma-widget-menubar-0.2.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc5c7cc2124fb8e312789f7733be6060
diff --git a/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8 b/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
index 8b821773f413..2700954cc023 100644
--- a/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
+++ b/metadata/md5-cache/kde-misc/plasma-widget-message-indicator-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdbusmenu-qt-0.3.0[qt4(+)] >=dev-libs/libindicate-qt-0.2.5
 RESTRICT=test
 SLOT=4
 SRC_URI=https://launchpad.net/plasma-widget-message-indicator/trunk/0.5.8/+download/plasma-widget-message-indicator-0.5.8.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=61ae3ae2b42fb9192381c05b956e6166
diff --git a/metadata/md5-cache/kde-misc/plasma-wifi-0.5-r1 b/metadata/md5-cache/kde-misc/plasma-wifi-0.5-r1
index 1a255d35bdea..3eadaf3952e1 100644
--- a/metadata/md5-cache/kde-misc/plasma-wifi-0.5-r1
+++ b/metadata/md5-cache/kde-misc/plasma-wifi-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/79476-plasma-wifi-0.5.tgz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=620d0b4937ee192f29764bbee8862270
diff --git a/metadata/md5-cache/kde-misc/plasmatvgr-0.47 b/metadata/md5-cache/kde-misc/plasmatvgr-0.47
index 932b776169a9..fa106c2c7d1d 100644
--- a/metadata/md5-cache/kde-misc/plasmatvgr-0.47
+++ b/metadata/md5-cache/kde-misc/plasmatvgr-0.47
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/75728-plasmatvgr047.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e8a75e2ad67e7891b8124700f9c17da8
diff --git a/metadata/md5-cache/kde-misc/plasmoid-workflow-0.4.1 b/metadata/md5-cache/kde-misc/plasmoid-workflow-0.4.1
index 8f49cb8e244b..fd8ed8fd27d1 100644
--- a/metadata/md5-cache/kde-misc/plasmoid-workflow-0.4.1
+++ b/metadata/md5-cache/kde-misc/plasmoid-workflow-0.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/kactivities:4 kde-plasma/libkworkspace:4 kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://www.opentoolsandspace.org/Art/WorkFlow/0.4.x/plasmoid-workflow-0.4.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc24dbcf63292924fb95c0fd2fc27b5e
diff --git a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1 b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1
index de13d6d8b965..d4f2c7f4c417 100644
--- a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1
+++ b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) >=kde-apps/libkonq-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kb.ccchl.de/quadkonsole4/quadkonsole4-0.4.4.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=51b2de2d3f0c39adca39bcbd45781102
diff --git a/metadata/md5-cache/kde-misc/quickaccess-0.8.2-r1 b/metadata/md5-cache/kde-misc/quickaccess-0.8.2-r1
index e609049dc102..8b31ac056f0f 100644
--- a/metadata/md5-cache/kde-misc/quickaccess-0.8.2-r1
+++ b/metadata/md5-cache/kde-misc/quickaccess-0.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-apps/libkonq-4.4:4[aqua=] kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/134442-plasma-widget-quickaccess-0.8.2-2.zip
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5bcbd216359fc51ca22df70e4a50c7b3
diff --git a/metadata/md5-cache/kde-misc/redshift-plasmoid-1.0 b/metadata/md5-cache/kde-misc/redshift-plasmoid-1.0
index b128839aef6a..0b7e48009881 100644
--- a/metadata/md5-cache/kde-misc/redshift-plasmoid-1.0
+++ b/metadata/md5-cache/kde-misc/redshift-plasmoid-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/plasma-workspace:4 x11-misc/redshift kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/148737-redshift-plasmoid-1.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=eb1b2a46e47d0f4203934191fb86b65a
diff --git a/metadata/md5-cache/kde-misc/semantik-0.9.4-r1 b/metadata/md5-cache/kde-misc/semantik-0.9.4-r1
index 1ca315085ce6..b72126b5b021 100644
--- a/metadata/md5-cache/kde-misc/semantik-0.9.4-r1
+++ b/metadata/md5-cache/kde-misc/semantik-0.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] >=dev-lang/python-exec-2:
 REQUIRED_USE=python_targets_python2_7
 SLOT=4
 SRC_URI=http://ftp.waf.io/pub/release/semantik-0.9.4.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	waf-utils	c21174962af5ca8091b66f58612797ce	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	waf-utils	c21174962af5ca8091b66f58612797ce	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1557e7c8208fad828acf38537aefdc00
diff --git a/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1 b/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
index d893e6b269f9..dc379103a8c2 100644
--- a/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
+++ b/metadata/md5-cache/kde-misc/serverstatuswidget-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/101336-serverstatuswidget-1.5.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=625dec0e7b69ba354d8c825a8db6622e
diff --git a/metadata/md5-cache/kde-misc/skanlite-1.1-r1 b/metadata/md5-cache/kde-misc/skanlite-1.1-r1
index e5b2ac05fc6a..633db2324487 100644
--- a/metadata/md5-cache/kde-misc/skanlite-1.1-r1
+++ b/metadata/md5-cache/kde-misc/skanlite-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libksane-4.4:4[aqua=] media-libs/libpng:0= kde-frameworks/oxygen-icons l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_ia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ia(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sq? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sq(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_wa(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/skanlite/1.1/src/skanlite-1.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a6fa0ef98d0adc81dc21ee8f5b7ec18
diff --git a/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130 b/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
index 93bbdaa52b3d..90a5801e6f59 100644
--- a/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
+++ b/metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libtaskmanager:4 kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_de(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_hu(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pl(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ru(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/smooth-tasks-0_p20120130.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc4325dc2f327d7d9cf533d1aa123c93
diff --git a/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1 b/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1
index c2ca4e5748c4..934454b3072f 100644
--- a/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1
+++ b/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/92309-0.2-beta1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ca22ae4548127e3f39f18ac13d8bfb8c
diff --git a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1 b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
index b939d8780ff2..c416dce7fb0c 100644
--- a/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
+++ b/metadata/md5-cache/kde-misc/steamcompanion-0.5.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/141713-steamcompanion.tar.gz -> steamcompanion-0.5.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ae228a3ed11b29f79d40557cc6d8726
diff --git a/metadata/md5-cache/kde-misc/stock-quote-2.1-r2 b/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
index 5bc881a47a54..8682051ab76f 100644
--- a/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
+++ b/metadata/md5-cache/kde-misc/stock-quote-2.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/90695-plasma_stock_quote-2.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e3d3609c3c774d8c89fe47eba03c04f
diff --git a/metadata/md5-cache/kde-misc/synaptiks-0.8.1-r4 b/metadata/md5-cache/kde-misc/synaptiks-0.8.1-r4
index 6c412a2fedb1..4b71e98b4311 100644
--- a/metadata/md5-cache/kde-misc/synaptiks-0.8.1-r4
+++ b/metadata/md5-cache/kde-misc/synaptiks-0.8.1-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/PyQt4-4.7[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=4
 SRC_URI=mirror://pypi/s/synaptiks/synaptiks-0.8.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2df24073b7344412ac3c643daece6d3c
diff --git a/metadata/md5-cache/kde-misc/tellico-2.3.10 b/metadata/md5-cache/kde-misc/tellico-2.3.10
index 0da0d6ed28fa..80b0038abf53 100644
--- a/metadata/md5-cache/kde-misc/tellico-2.3.10
+++ b/metadata/md5-cache/kde-misc/tellico-2.3.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson dev-qt/qtdbus:4 media-l
 RESTRICT=test
 SLOT=4
 SRC_URI=http://tellico-project.org/files/tellico-2.3.10.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1c066acfa6aa308df2b2e84f4cd138b8
diff --git a/metadata/md5-cache/kde-misc/tellico-2.3.11 b/metadata/md5-cache/kde-misc/tellico-2.3.11
index d5cb9aea3a02..6d7afbeca7d7 100644
--- a/metadata/md5-cache/kde-misc/tellico-2.3.11
+++ b/metadata/md5-cache/kde-misc/tellico-2.3.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson dev-qt/qtdbus:4 media-l
 RESTRICT=test
 SLOT=4
 SRC_URI=http://tellico-project.org/files/tellico-2.3.11.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=009bd826b4a45abbc564547db521a643
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-2.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
index ca2729948ead..18e3a77ae3fc 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6bcbe24d821b65262cf353f915a27cb6
diff --git a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1 b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
index 02317fe11531..f7e798b52774 100644
--- a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
+++ b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/132366-wicd-kde-0.3.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e0a0fbdd198c8ac01cd42d310f50d36c
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3 b/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3
index 319feb50be69..a0b6961067c4 100644
--- a/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3
+++ b/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) x11-libs/libX11 kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_wa(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/yakuake/2.9.9/src/yakuake-2.9.9.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0665e78c9ab463a73fd2709d2a617651
diff --git a/metadata/md5-cache/kde-misc/yawp-0.4.5 b/metadata/md5-cache/kde-misc/yawp-0.4.5
index ddd0a466a732..521757a1fc2d 100644
--- a/metadata/md5-cache/kde-misc/yawp-0.4.5
+++ b/metadata/md5-cache/kde-misc/yawp-0.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/plasma-workspace:4 kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/yawp/yawp-0.4.5.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8ac1922f7a0b8f8f29e435d8e3060b99
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.2.1-r1 b/metadata/md5-cache/kde-misc/zanshin-0.2.1-r1
index 10216515f0ae..0e90513d031a 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.2.1-r1
+++ b/metadata/md5-cache/kde-misc/zanshin-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepim-runtime-4.6.0:4[aqua=] dev-libs/boost kde-frameworks/o
 RESTRICT=test
 SLOT=4
 SRC_URI=https://files.kde.org/zanshin/zanshin-0.2.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e05b07701e232bfced8c16c1ed71c14f
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.3.1 b/metadata/md5-cache/kde-misc/zanshin-0.3.1
index aba7d50a3bf8..f9f0184cc038 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.3.1
+++ b/metadata/md5-cache/kde-misc/zanshin-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepim-runtime-4.6.0:4[aqua=] >=kde-apps/kdepimlibs-4.4:4[aqu
 RESTRICT=test
 SLOT=4
 SRC_URI=https://files.kde.org/zanshin/zanshin-0.3.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=949c7bcf59a6f0878eb25b6cc74d1eca
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-2.1.1 b/metadata/md5-cache/kde-plasma/bluedevil-2.1.1
index 5a0262559375..52d2f5a64dc8 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-2.1.1
+++ b/metadata/md5-cache/kde-plasma/bluedevil-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-libs/libbluedevil-2.1:4 x11-misc/shared-mime-info kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/bluedevil/2.1.1/src/bluedevil-2.1.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1047eac1fb6ddb3f099d365077a1ed33
diff --git a/metadata/md5-cache/kde-plasma/freespacenotifier-4.11.22 b/metadata/md5-cache/kde-plasma/freespacenotifier-4.11.22
index 0fe85d73c07b..747017b2841d 100644
--- a/metadata/md5-cache/kde-plasma/freespacenotifier-4.11.22
+++ b/metadata/md5-cache/kde-plasma/freespacenotifier-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e2f12b1f1f45016c6ff377da4471144b
diff --git a/metadata/md5-cache/kde-plasma/kcheckpass-4.11.22-r1 b/metadata/md5-cache/kde-plasma/kcheckpass-4.11.22-r1
index 67e26c00eeff..2f64a5388060 100644
--- a/metadata/md5-cache/kde-plasma/kcheckpass-4.11.22-r1
+++ b/metadata/md5-cache/kde-plasma/kcheckpass-4.11.22-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pam? ( virtual/pam ) pam? ( || ( kde-plasma/kdebase-pam kde-plasma/kscreenlocker:5 ) ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7e7a38a8aa319db2714744a0c2b5e745
diff --git a/metadata/md5-cache/kde-plasma/kcminit-4.11.22 b/metadata/md5-cache/kde-plasma/kcminit-4.11.22
index 7adf06cc6ba1..47364f9e4dde 100644
--- a/metadata/md5-cache/kde-plasma/kcminit-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kcminit-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=655dd82587e1597c6a9be2880d86bc69
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-2.2.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-2.2.1
index 1e32fc032bf9..09d735f7fa12 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-2.2.1
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtk+:3 !kde-misc/kcm_gtk >=kde-apps/kcmshell-2.2.1:4[aqua=] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a5c89a1f0eb00c5a268ec9b6d4993a4
diff --git a/metadata/md5-cache/kde-plasma/kdebase-cursors-4.11.22 b/metadata/md5-cache/kde-plasma/kdebase-cursors-4.11.22
index 15f80e22b511..5731de9f8418 100644
--- a/metadata/md5-cache/kde-plasma/kdebase-cursors-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kdebase-cursors-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b8a030485b94df35d82ad2f8c9be61c
diff --git a/metadata/md5-cache/kde-plasma/kdebase-startkde-4.11.22-r2 b/metadata/md5-cache/kde-plasma/kdebase-startkde-4.11.22-r2
index 8d74469923de..c5a2270758eb 100644
--- a/metadata/md5-cache/kde-plasma/kdebase-startkde-4.11.22-r2
+++ b/metadata/md5-cache/kde-plasma/kdebase-startkde-4.11.22-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/attica-4.11.22:4[aqua=] >=kde-apps/kcmshell-4.11.22:4[aqua=] >=kde-apps/kcontrol-4.11.22:4[aqua=] >=kde-apps/kdebase-data-4.11.22:4[aqua=] >=kde-apps/kdebase-desktoptheme-4.11.22:4[aqua=] >=kde-apps/kdebase-kioslaves-4.11.22:4[aqua=] >=kde-apps/kdebase-menu-4.11.22:4[aqua=] >=kde-apps/kdebase-menu-icons-4.11.22:4[aqua=] >=kde-apps/kdebugdialog-4.11.22:4[aqua=] >=kde-apps/kdesu-4.11.22:4[aqua=] >=kde-apps/kdontchangethehostname-4.11.22:4[aqua=] >=kde-apps/keditfiletype-4.11.22:4[aqua=] >=kde-apps/kfile-4.11.22:4[aqua=] >=kde-apps/kfmclient-4.11.22:4[aqua=] >=kde-apps/kglobalaccel-4.11.22:4[aqua=] >=kde-apps/kiconfinder-4.11.22:4[aqua=] >=kde-apps/kimgio-4.11.22:4[aqua=] >=kde-apps/kioclient-4.11.22:4[aqua=] >=kde-apps/kmimetypefinder-4.11.22:4[aqua=] >=kde-apps/knetattach-4.11.22:4[aqua=] >=kde-apps/knewstuff-4.11.22:4[aqua=] >=kde-apps/knotify-4.11.22:4[aqua=] >=kde-apps/knotify-4.11.22:4[aqua=] >=kde-apps/kpasswdserver-4.11.22:4[aqua=] >=kde-apps/kquitapp-4.11.22:4[aqua=] >=kde-apps/kreadconfig-4.11.22:4[aqua=] >=kde-apps/kstart-4.11.22:4[aqua=] >=kde-apps/ktimezoned-4.11.22:4[aqua=] >=kde-apps/ktraderclient-4.11.22:4[aqua=] >=kde-apps/kuiserver-4.11.22:4[aqua=] >=kde-apps/kurifilter-plugins-4.11.22:4[aqua=] >=kde-apps/kwalletd-4.11.22:4[aqua=] >=kde-apps/kwalletmanager-4.11.22:4[aqua=] >=kde-apps/phonon-kde-4.11.22:4[aqua=] >=kde-apps/plasma-apps-4.11.22:4[aqua=] >=kde-apps/plasma-runtime-4.11.22:4[aqua=] >=kde-apps/renamedlg-plugins-4.11.22:4[aqua=] >=kde-apps/solid-runtime-4.11.22:4[aqua=] kde-plasma/kcminit:4 kde-plasma/krunner:4 kde-plasma/ksmserver:4 kde-plasma/ksplash:4 kde-plasma/kstartupconfig:4 kde-plasma/kwin:4 kde-plasma/plasma-workspace:4 kde-plasma/systemsettings:4 x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xsetroot x11-apps/xset crash-reporter? ( >=kde-apps/drkonqi-4.11.22:4[aqua=] ) handbook? ( kde-apps/khelpcenter:* ) !minimal? ( >=kde-apps/kdepasswd-4.11.22:4[aqua=] kde-plasma/freespacenotifier:4 kde-plasma/kcheckpass:4 kde-plasma/kdebase-cursors:4 kde-plasma/kephal:4 kde-plasma/khotkeys:4 kde-plasma/kinfocenter:4 kde-plasma/klipper:4 kde-plasma/kmenuedit:4 kde-plasma/kstyles:4 kde-plasma/ksysguard:4 kde-plasma/ksystraycmd:4 kde-plasma/kwrited:4 kde-plasma/libkworkspace:4 kde-plasma/liboxygenstyle:4 kde-plasma/libplasmaclock:4 kde-plasma/libplasmagenericshell:4 kde-plasma/libtaskmanager:4 kde-plasma/powerdevil:4 kde-plasma/qguiplatformplugin_kde:4 kde-plasma/solid-actions-kcm:4 ) wallpapers? ( kde-plasma/plasma-workspace-wallpapers:5 ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cdc9380d33125fd45d46c961259e068d
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
index c5022ac8dbb0..2e924af7b548 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/qca:2[qt4(+)] kde-plasma/krunner:4 kde-plasma/plasma-workspace
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kdeplasma-addons-4.14.3.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00d444da3735c5c0e78536d916159f20
diff --git a/metadata/md5-cache/kde-plasma/kdm-4.11.22 b/metadata/md5-cache/kde-plasma/kdm-4.11.22
index dd9c7b8ae2ce..4db39426643c 100644
--- a/metadata/md5-cache/kde-plasma/kdm-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kdm-4.11.22
@@ -10,5 +10,5 @@ RDEPEND=kde-plasma/libkworkspace:4 media-libs/qimageblitz x11-libs/libX11 x11-li
 REQUIRED_USE=consolekit? ( !systemd ) systemd? ( !consolekit )
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a780c3e651b95228c934bab332dd06c1
diff --git a/metadata/md5-cache/kde-plasma/kephal-4.11.22 b/metadata/md5-cache/kde-plasma/kephal-4.11.22
index d936c0ac67c3..8e65d12c556a 100644
--- a/metadata/md5-cache/kde-plasma/kephal-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kephal-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f0005ecf70a7e2ff62e9d48afc51268d
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-4.11.22 b/metadata/md5-cache/kde-plasma/khotkeys-4.11.22
index 59376421889e..79a74b8759bc 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-4.11.22
+++ b/metadata/md5-cache/kde-plasma/khotkeys-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libkworkspace:4 x11-libs/libX11 x11-libs/libXtst kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=540e47193eb12e4e3b329ba8ba124439
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-4.11.22 b/metadata/md5-cache/kde-plasma/kinfocenter-4.11.22
index 7a8919b1edb3..1999617180f1 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( virtual/glu virtual/opengl ) sys-apps/usbutils kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.11.22:4[aqua=,handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=618abccdb4e6f6811c2fc3eca5000968
diff --git a/metadata/md5-cache/kde-plasma/klipper-4.11.22 b/metadata/md5-cache/kde-plasma/klipper-4.11.22
index 0bfd390cd019..408c2b5da49f 100644
--- a/metadata/md5-cache/kde-plasma/klipper-4.11.22
+++ b/metadata/md5-cache/kde-plasma/klipper-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libkworkspace:4 kde-plasma/libtaskmanager:4 sys-libs/zlib x11-libs/libX11 prison? ( kde-frameworks/prison:4 ) kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.11.22:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49bb194f62aea358c9bc71af395e01cf
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-4.11.22 b/metadata/md5-cache/kde-plasma/kmenuedit-4.11.22
index ea803968cd34..ae72f9906df8 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/khotkeys:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.11.22:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=755b39bee31c1b24d8d8a3dd82e5551d
diff --git a/metadata/md5-cache/kde-plasma/krunner-4.11.22 b/metadata/md5-cache/kde-plasma/krunner-4.11.22
index e7f5a01e622f..2c6e5c270616 100644
--- a/metadata/md5-cache/kde-plasma/krunner-4.11.22
+++ b/metadata/md5-cache/kde-plasma/krunner-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kcheckpass:4 kde-plasma/kephal:4 kde-plasma/ksmserver:4 kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 kde-plasma/libplasmagenericshell:4 !aqua? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext ) kde-frameworks/oxygen-icons opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ace79eb7a1a48cb5ab6cfbe1fbc4143
diff --git a/metadata/md5-cache/kde-plasma/kscreen-1.0.71_p20150824 b/metadata/md5-cache/kde-plasma/kscreen-1.0.71_p20150824
index 22e3c559cb3d..0ba37a2de005 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-1.0.71_p20150824
+++ b/metadata/md5-cache/kde-plasma/kscreen-1.0.71_p20150824
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/qjson-0.8 >=kde-plasma/libkscreen-1.0.4:4 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~kensington/distfiles/kscreen-1.0.71_p20150824.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=be4796103718091b676d2170712611fe
diff --git a/metadata/md5-cache/kde-plasma/kscreensaver-4.11.22 b/metadata/md5-cache/kde-plasma/kscreensaver-4.11.22
index 21bc3ff807b9..4fe4bd4842eb 100644
--- a/metadata/md5-cache/kde-plasma/kscreensaver-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kscreensaver-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kcheckpass:4 x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=25bed374556908905ecdf1c43fb6c96a
diff --git a/metadata/md5-cache/kde-plasma/ksmserver-4.11.22 b/metadata/md5-cache/kde-plasma/ksmserver-4.11.22
index 5c2f2e4e4caa..4106df57e688 100644
--- a/metadata/md5-cache/kde-plasma/ksmserver-4.11.22
+++ b/metadata/md5-cache/kde-plasma/ksmserver-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kcminit:4 kde-plasma/libkworkspace:4 media-libs/qimageblitz x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrender kde-plasma/libkgreeter:4 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1bf79e7109283b6c95651b01376f295c
diff --git a/metadata/md5-cache/kde-plasma/ksplash-4.11.22 b/metadata/md5-cache/kde-plasma/ksplash-4.11.22
index 8c3246a9b873..8ef0224ec55f 100644
--- a/metadata/md5-cache/kde-plasma/ksplash-4.11.22
+++ b/metadata/md5-cache/kde-plasma/ksplash-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-libs/libXinerama ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=48f763d8ec38ff9aa2d447fa4e2544bf
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-0.5.3-r1 b/metadata/md5-cache/kde-plasma/ksshaskpass-0.5.3-r1
index fd2c10be2904..6451174606e2 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-0.5.3-r1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-0.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/openssh kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9044160af9f98b302ac6230d73ee2946
diff --git a/metadata/md5-cache/kde-plasma/kstartupconfig-4.11.22 b/metadata/md5-cache/kde-plasma/kstartupconfig-4.11.22
index 609a2ed852b5..415daf86f2dd 100644
--- a/metadata/md5-cache/kde-plasma/kstartupconfig-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kstartupconfig-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f807aa6bdb153dc35c671ff3ebdc3fe2
diff --git a/metadata/md5-cache/kde-plasma/kstyles-4.11.22 b/metadata/md5-cache/kde-plasma/kstyles-4.11.22
index bd60e24a52e6..81669c197508 100644
--- a/metadata/md5-cache/kde-plasma/kstyles-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kstyles-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/liboxygenstyle:4= x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ca891801a7f1b7f63cb83d0abd28345a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-4.11.22 b/metadata/md5-cache/kde-plasma/ksysguard-4.11.22
index b0c916671a81..3f296f7f3aab 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-4.11.22
+++ b/metadata/md5-cache/kde-plasma/ksysguard-4.11.22
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXres lm_sensors? ( sys-apps/lm
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=82ad7aabf9c13c99aba2b622f1b9e879
diff --git a/metadata/md5-cache/kde-plasma/ksystraycmd-4.11.22 b/metadata/md5-cache/kde-plasma/ksystraycmd-4.11.22
index 9a4bfd05947f..e95a961d4203 100644
--- a/metadata/md5-cache/kde-plasma/ksystraycmd-4.11.22
+++ b/metadata/md5-cache/kde-plasma/ksystraycmd-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bc247bcc40fc69cd58660c9d58266fb2
diff --git a/metadata/md5-cache/kde-plasma/kwin-4.11.22 b/metadata/md5-cache/kde-plasma/kwin-4.11.22
index 395056d6ce77..8c257a5e8985 100644
--- a/metadata/md5-cache/kde-plasma/kwin-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kwin-4.11.22
@@ -11,5 +11,5 @@ REQUIRED_USE=!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d7d118e19fccf226d07575cb4f8ebd98
diff --git a/metadata/md5-cache/kde-plasma/kwrited-4.11.22 b/metadata/md5-cache/kde-plasma/kwrited-4.11.22
index 8608ea00ca3a..3d117590802c 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-4.11.22
+++ b/metadata/md5-cache/kde-plasma/kwrited-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa1bc8a68ca4e5b0bf1d2aba2fba5aa1
diff --git a/metadata/md5-cache/kde-plasma/libkgreeter-4.11.22 b/metadata/md5-cache/kde-plasma/libkgreeter-4.11.22
index 27dabc36cb24..636729406937 100644
--- a/metadata/md5-cache/kde-plasma/libkgreeter-4.11.22
+++ b/metadata/md5-cache/kde-plasma/libkgreeter-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-plasma/kdm-4.11.17-r1:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa88805d32d4c43b78cce54e11c6b859
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-1.0.5_p20150822 b/metadata/md5-cache/kde-plasma/libkscreen-1.0.5_p20150822
index 3b624c83e0f1..4d2c11c036fd 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-1.0.5_p20150822
+++ b/metadata/md5-cache/kde-plasma/libkscreen-1.0.5_p20150822
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.8 x11-libs/libX11 x11-libs/libxcb x11-libs/libXrandr kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/libkscreen-1.0.5_p20150822.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=86ec1d6dbb4ec35a1047ec32db753d55
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-4.11.22 b/metadata/md5-cache/kde-plasma/libkworkspace-4.11.22
index 661abb3c7ef5..e5add48f2f9b 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-4.11.22
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXau kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a3b17e87a4bac0f5c50fdb9d04577a1d
diff --git a/metadata/md5-cache/kde-plasma/liboxygenstyle-4.11.22 b/metadata/md5-cache/kde-plasma/liboxygenstyle-4.11.22
index 076f41558a53..5b94a6e4e07e 100644
--- a/metadata/md5-cache/kde-plasma/liboxygenstyle-4.11.22
+++ b/metadata/md5-cache/kde-plasma/liboxygenstyle-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11.22
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=19d7a47f24bf272bbeab8605a1083012
diff --git a/metadata/md5-cache/kde-plasma/libplasmaclock-4.11.22 b/metadata/md5-cache/kde-plasma/libplasmaclock-4.11.22
index 7bac49c2aeff..1d7938dad204 100644
--- a/metadata/md5-cache/kde-plasma/libplasmaclock-4.11.22
+++ b/metadata/md5-cache/kde-plasma/libplasmaclock-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kephal:4 pim? ( >=kde-apps/kdepimlibs-4.11.22:4[aqua=] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=95628628f6006a382a18742e831785bc
diff --git a/metadata/md5-cache/kde-plasma/libplasmagenericshell-4.11.22 b/metadata/md5-cache/kde-plasma/libplasmagenericshell-4.11.22
index 7f39ae48f160..606b34ffd32f 100644
--- a/metadata/md5-cache/kde-plasma/libplasmagenericshell-4.11.22
+++ b/metadata/md5-cache/kde-plasma/libplasmagenericshell-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kephal:4 kde-plasma/libkworkspace:4 x11-libs/libX11 kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b018f6db18e4d83720799e17173bff4a
diff --git a/metadata/md5-cache/kde-plasma/libtaskmanager-4.11.22 b/metadata/md5-cache/kde-plasma/libtaskmanager-4.11.22
index f104acf4d3f6..f4d0c751d5ac 100644
--- a/metadata/md5-cache/kde-plasma/libtaskmanager-4.11.22
+++ b/metadata/md5-cache/kde-plasma/libtaskmanager-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/kactivities:4 kde-plasma/kephal:4 kde-plasma/ksysguard:4 kde-plasma/libkworkspace:4 x11-libs/libX11 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b5bd1ffd2b263a5e72ac9578a0669b11
diff --git a/metadata/md5-cache/kde-plasma/milou-0.1 b/metadata/md5-cache/kde-plasma/milou-0.1
index d7eb07aa526f..2f9da221bc84 100644
--- a/metadata/md5-cache/kde-plasma/milou-0.1
+++ b/metadata/md5-cache/kde-plasma/milou-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-apps/kdepimlibs-0.1:4[aqua=] kde-frameworks/baloo:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/milou/0.1/src/milou-0.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e6b87762220fe506de7688185162c6ef
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-0.9.3.6 b/metadata/md5-cache/kde-plasma/plasma-nm-0.9.3.6
index 05077c5995e9..54cbc54c8da8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-0.9.3.6
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-0.9.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=net-libs/libnm-qt-0.9.8.2[modemmanager?] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.8.0 modemmanager? ( >=net-libs/libmm-qt-1.0.0 ) openconnect? ( net-misc/networkmanager-openconnect net-misc/openconnect:= ) !kde-misc/networkmanagement kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/plasma-nm/plasma-nm-0.9.3.6.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a838ed7d684080390c671f2e578c3da4
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-4.11.22 b/metadata/md5-cache/kde-plasma/plasma-workspace-4.11.22
index a6dd2d3aa0f4..2dbc7a87f250 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-4.11.22
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-4.11.22
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdbusmenu-qt >=dev-qt/qtcore-4.8.4-r3:4 kde-frameworks/kactiv
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e624d82274a322aa190767f98da2e16
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-4.11.22 b/metadata/md5-cache/kde-plasma/powerdevil-4.11.22
index 36e917012d61..64d9b43dbe6d 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-4.11.22
+++ b/metadata/md5-cache/kde-plasma/powerdevil-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/kactivities:4 kde-plasma/libkworkspace:4 !aqua? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) pm-utils? ( sys-power/pm-utils ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ae13053e91d4e5e2e077776fdb5d8983
diff --git a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22 b/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
index 090d2e5e9bd0..6d2de93b64e5 100644
--- a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
+++ b/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b3abacd42d413b0ef6263822c12bf9e4
diff --git a/metadata/md5-cache/kde-plasma/solid-actions-kcm-4.11.22 b/metadata/md5-cache/kde-plasma/solid-actions-kcm-4.11.22
index fa84487e5c61..c0129e16400b 100644
--- a/metadata/md5-cache/kde-plasma/solid-actions-kcm-4.11.22
+++ b/metadata/md5-cache/kde-plasma/solid-actions-kcm-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/solid-runtime-4.11.22:4[aqua=] !kde-base/solid:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bbbb3f2093d6bd9a81eae86acde8d2d9
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-4.11.22-r2 b/metadata/md5-cache/kde-plasma/systemsettings-4.11.22-r2
index b0ea56231e38..0a0a835441b4 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-4.11.22-r2
+++ b/metadata/md5-cache/kde-plasma/systemsettings-4.11.22-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 kde-plasma/kwin:4 kde-plasma/libkworkspace:4 media-libs/
 RESTRICT=test
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	kde4-meta	78e721b355590fa8c4658505218b3838	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b578066faf1b2b181dc5aab97a0d89cc
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r2 b/metadata/md5-cache/mail-client/trojita-0.7-r2
new file mode 100644
index 000000000000..f037491742e8
--- /dev/null
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5] ) zlib? ( sys-libs/zlib ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) zlib? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A Qt IMAP e-mail client
+EAPI=6
+HOMEPAGE=http://trojita.flaska.net/
+IUSE=+crypt +dbus debug +password test +zlib test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5] ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e90157329308bc06d505c740b4f60deb
diff --git a/metadata/md5-cache/media-gfx/darktable-2.2.0_rc2 b/metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
similarity index 97%
rename from metadata/md5-cache/media-gfx/darktable-2.2.0_rc2
rename to metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
index 6d830bce9bb3..31ea4b2fcd60 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.2.0_rc2
+++ b/metadata/md5-cache/media-gfx/darktable-2.2.0_rc3
@@ -9,6 +9,6 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 virtual/glu virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kde? ( kde-apps/kwalletd:4 )
 REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
-SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.0rc2/darktable-2.2.0.rc2.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf -> darktable-usermanual-1.6.0.pdf )
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.2.0rc3/darktable-2.2.0.rc3.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf -> darktable-usermanual-1.6.0.pdf )
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d57796c9eadc908d3f4c19ea75d71a45
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
index dc0bea961914..0726188c1d2f 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ku? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ku(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kcoloredit-2.0.0-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=48192bdade5754d6a956b5ce643068d3
diff --git a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1 b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
index 8e49e4fa99cf..f5503575eca6 100644
--- a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
+++ b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_wa(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kfax-3.3.6-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0b2e0e5936a3d578a524f8463e479ac5
diff --git a/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1 b/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
index 4898310a9b00..3220334523fe 100644
--- a/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
+++ b/metadata/md5-cache/media-gfx/kflickr-0.9.1_p1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://gentoo/kflickr-0.9.1_p1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=14fb3652437daecd53038d054e2490ec
diff --git a/metadata/md5-cache/media-gfx/kgrab-0.1.1 b/metadata/md5-cache/media-gfx/kgrab-0.1.1
index 8b4ae32ff2a4..ce4df5e50aba 100644
--- a/metadata/md5-cache/media-gfx/kgrab-0.1.1
+++ b/metadata/md5-cache/media-gfx/kgrab-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kgrab-0.1.1-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e61e7c5e6e8447e60e75cf4b69484d7
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.2.0 b/metadata/md5-cache/media-gfx/kgraphviewer-2.2.0
index cd28ff1ae336..627739f50a4b 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.2.0
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=media-gfx/graphviz-2.30 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kgraphviewer/2.2.0/src/kgraphviewer-2.2.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1a33c461612193aa4d469d3db4228e4
diff --git a/metadata/md5-cache/media-gfx/kiconedit-4.4.0 b/metadata/md5-cache/media-gfx/kiconedit-4.4.0
index a4e8f160dc15..2b4723519124 100644
--- a/metadata/md5-cache/media-gfx/kiconedit-4.4.0
+++ b/metadata/md5-cache/media-gfx/kiconedit-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_wa(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kiconedit-4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b32f10ebc6a9c1ac773bd3546eb3e5af
diff --git a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1 b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
index 2949f5330302..07458ec91102 100644
--- a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
+++ b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=media-libs/freetype virtual/glu x11-libs/libX11 media-gfx/povray kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~kensington/kpovmodeler-1.1.3-kde4.1.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=50102793e8aa61eae36fee1df229a5bc
diff --git a/metadata/md5-cache/media-gfx/krita-3.0 b/metadata/md5-cache/media-gfx/krita-3.0
deleted file mode 100644
index 9f7a4ddbddc7..000000000000
--- a/metadata/md5-cache/media-gfx/krita-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-0.7.4 <dev-libs/vc-0.7.5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
-IUSE=color-management fftw +gsl +jpeg jpeg2k openexr pdf +raw tiff vc debug test
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/3.0/krita-3.0.tgz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ba68a0fda29761520a1a68fed1541505
diff --git a/metadata/md5-cache/media-gfx/krita-3.0.1 b/metadata/md5-cache/media-gfx/krita-3.1.1
similarity index 97%
rename from metadata/md5-cache/media-gfx/krita-3.0.1
rename to metadata/md5-cache/media-gfx/krita-3.1.1
index 6df1ad6c815a..59f152b839bd 100644
--- a/metadata/md5-cache/media-gfx/krita-3.0.1
+++ b/metadata/md5-cache/media-gfx/krita-3.1.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kguiaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kitemmodels-5.26.0:5 >=kde-frameworks/kitemviews-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kwindowsystem-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[-gles2] >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
-SRC_URI=mirror://kde/stable/krita/3.0.1/krita-3.0.1.tar.gz
+SRC_URI=mirror://kde/stable/krita/3.1.1/krita-3.1.1.tar.gz
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	19ab4fcd7355a83966d97839f1c21b7b	kde5-functions	e944f934c4768113a108eb0184031467	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=613795012b0a96e74c6d0e4a82a3226d
+_md5_=9794d5aeb4f9aa9f5ef8dd01849b452b
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
index 9950d4c10846..6f91ad049994 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib !media-gfx/kuickshow:0 kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bn(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_uz? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uz(+)] ) l10n_uz-Cyrl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uz-Cyrl(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=67a153f6719029868c2b01c2873521ad
diff --git a/metadata/md5-cache/media-gfx/wally-2.4.5 b/metadata/md5-cache/media-gfx/wally-2.4.5
index 5c8024ce4732..bfe4f2769207 100644
--- a/metadata/md5-cache/media-gfx/wally-2.4.5
+++ b/metadata/md5-cache/media-gfx/wally-2.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libexif x11-libs/libX11 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde? ( >=kde-base/kdelibs-4.4:4[aqua=] ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
 SLOT=4
 SRC_URI=mirror://sourceforge/wally/wally-2.4.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aaa275bf93e588fde6448f04cfcfb991
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.3 b/metadata/md5-cache/media-gfx/wings-2.1.5
similarity index 89%
rename from metadata/md5-cache/media-gfx/wings-2.1.3
rename to metadata/md5-cache/media-gfx/wings-2.1.5
index fca48c9a232e..24c78ac8c129 100644
--- a/metadata/md5-cache/media-gfx/wings-2.1.3
+++ b/metadata/md5-cache/media-gfx/wings-2.1.5
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-18.1[smp,wxwidgets] dev-libs/cl media-libs/libsdl[opengl]
 SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.3.tar.bz2
+SRC_URI=mirror://sourceforge/wings/wings-2.1.5.tar.bz2
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=a616bb733270246a24d53724e630b0b0
diff --git a/metadata/md5-cache/media-libs/cimg-1.7.9 b/metadata/md5-cache/media-libs/cimg-1.7.9
new file mode 100644
index 000000000000..20322d9693cc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/cimg-1.7.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=C++ template image processing toolkit
+EAPI=6
+HOMEPAGE=http://cimg.eu/ https://github.com/dtschump/CImg
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 CeCILL-C
+SLOT=0
+SRC_URI=https://github.com/dtschump/CImg/archive/v.179.tar.gz -> cimg-1.7.9.tar.gz
+_md5_=cb8625f72122d2ad39d0165fc8fe6a6b
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
index f61956e36f81..7c4688dfc645 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=5
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-0.10.36:0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-plugins/gst-plugins-farsight-0.12.11:0.10 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz https://dev.gentoo.org/~tetromino/distfiles/gst-plugins-bad/gst-plugins-bad-0.10.23-h264-patches.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gstreamer	78d7ea756d946d3721182baab0aa5395	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e7740f50d16033b820a39b6b1cf53f06
+_md5_=77e91179be80f36e6976d3ca0345ca4a
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.8.3-r1 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.8.3-r1
index bf81e493d096..d34514d2f631 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.8.3-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.8.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.8.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.8.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-good-1.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=egl? ( !gles2 ) gles2? ( !opengl ) opengl? ( X ) wayland? ( egl )
+REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.3.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gstreamer	78d7ea756d946d3721182baab0aa5395	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f5fbba5452896c2452f07bcb8738e887
+_md5_=7d4e6c178479f2c3b8dccd531729b580
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.3 b/metadata/md5-cache/media-libs/libcdr-0.1.3
index 04db0d41be7a..6103bea40d02 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.3
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.3
@@ -9,5 +9,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.3.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=51ffd0e916040bd377d1b0294f862153
+_md5_=c435277582b6b88b9b13728e0ca3a89b
diff --git a/metadata/md5-cache/media-libs/libcdr-9999 b/metadata/md5-cache/media-libs/libcdr-9999
index ff9e0980d591..33ba800bb3ec 100644
--- a/metadata/md5-cache/media-libs/libcdr-9999
+++ b/metadata/md5-cache/media-libs/libcdr-9999
@@ -8,4 +8,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=51ffd0e916040bd377d1b0294f862153
+_md5_=c435277582b6b88b9b13728e0ca3a89b
diff --git a/metadata/md5-cache/media-libs/libfreehand-0.1.1 b/metadata/md5-cache/media-libs/libfreehand-0.1.1
index 95ffc65e34b9..5d517b061e99 100644
--- a/metadata/md5-cache/media-libs/libfreehand-0.1.1
+++ b/metadata/md5-cache/media-libs/libfreehand-0.1.1
@@ -9,5 +9,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.1.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9da6fa953a2e947a40295ced46a4659b
+_md5_=c98e405a5ae5d893884f8aa7c29a8cbf
diff --git a/metadata/md5-cache/media-libs/libfreehand-9999 b/metadata/md5-cache/media-libs/libfreehand-9999
index 77bc38ff589c..3f16f9dc281a 100644
--- a/metadata/md5-cache/media-libs/libfreehand-9999
+++ b/metadata/md5-cache/media-libs/libfreehand-9999
@@ -8,4 +8,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=55b8bfe528b1155e52abf1b3ae209615
+_md5_=ac7950e72975d364256877995c074705
diff --git a/metadata/md5-cache/media-libs/libgltf-9999 b/metadata/md5-cache/media-libs/libgltf-9999
index 399aa884b95a..3be3f57c092d 100644
--- a/metadata/md5-cache/media-libs/libgltf-9999
+++ b/metadata/md5-cache/media-libs/libgltf-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/opengl dev-libs/boost media-libs/glew:= media-libs/glm sys-devel/libtool virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=media-libs/libepoxy-1.3.1 virtual/opengl dev-libs/boost media-libs/glm sys-devel/libtool virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C++ Library for rendering OpenGL models stored in glTF format
 EAPI=6
 HOMEPAGE=http://www.libreoffice.org
 IUSE=debug test
 LICENSE=MPL-2.0
-RDEPEND=virtual/opengl
+RDEPEND=>=media-libs/libepoxy-1.3.1 virtual/opengl
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dd715eb45c107d302d0a684e0527224f
+_md5_=4615948dafe033d4f0f975cf011382f2
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.4.5 b/metadata/md5-cache/media-libs/libmatroska-1.4.5
index 6523c4a9c1d0..b8309085a9e8 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.4.5
+++ b/metadata/md5-cache/media-libs/libmatroska-1.4.5
@@ -4,9 +4,9 @@ DESCRIPTION=Extensible multimedia container format based on EBML
 EAPI=6
 HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
 IUSE=static-libs
-KEYWORDS=alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libebml-1.3.4:=
 SLOT=0/6
 SRC_URI=http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.5.tar.bz2
-_md5_=0630166436cb6a5e7acebd2c7f38c6d4
+_md5_=18091d295c37765d3975e1dd2191bc06
diff --git a/metadata/md5-cache/media-libs/libpagemaker-0.0.3 b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
similarity index 69%
rename from metadata/md5-cache/media-libs/libpagemaker-0.0.3
rename to metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
index 08755fbef635..fcf06a682ab4 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.3
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.3-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/librevenge >=dev-libs/boost-1.47 virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker documents.
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
@@ -9,4 +9,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.3.tar.xz
-_md5_=d14a5edd76ddcc80cf4550ecfa29c8eb
+_md5_=ec20e6e1480975998c43316564df8362
diff --git a/metadata/md5-cache/media-libs/libpagemaker-9999 b/metadata/md5-cache/media-libs/libpagemaker-9999
index dd72613d2be1..189e68be1e24 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-9999
+++ b/metadata/md5-cache/media-libs/libpagemaker-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/librevenge >=dev-libs/boost-1.47 virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker documents.
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
@@ -8,4 +8,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d14a5edd76ddcc80cf4550ecfa29c8eb
+_md5_=ec20e6e1480975998c43316564df8362
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.5 b/metadata/md5-cache/media-libs/libvisio-0.1.5
index 66d41988be93..1518a9724232 100644
--- a/metadata/md5-cache/media-libs/libvisio-0.1.5
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl dev-libs/boost dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library parsing the visio documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.5.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d9de2de749f13fcc6535002c564c5333
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=d67892f66cc8da1fa425db42a5027f72
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index f4f16d927c46..3bc8cba72923 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl dev-libs/boost dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library parsing the visio documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
@@ -8,4 +8,4 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8c432fec0133d8f8f0224878984c38bb
+_md5_=b151b0befb2733c6bb6f7a6fd3a3f24c
diff --git a/metadata/md5-cache/media-libs/t1lib-5.1.2-r1 b/metadata/md5-cache/media-libs/t1lib-5.1.2-r1
index 57e6b6b2f709..6e7d1920b3d5 100644
--- a/metadata/md5-cache/media-libs/t1lib-5.1.2-r1
+++ b/metadata/md5-cache/media-libs/t1lib-5.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Type 1 Font Rasterizer Library for UNIX/X11
 EAPI=6
 HOMEPAGE=ftp://metalab.unc.edu/pub/Linux/libs/graphics/
 IUSE=X doc static-libs
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 RDEPEND=X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXt )
 SLOT=5
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=df27619cbd8b66e3a5c0006079cc26c0
+_md5_=c3242ce0349723eb83cac120d9caad4c
diff --git a/metadata/md5-cache/media-plugins/live-2016.11.28 b/metadata/md5-cache/media-plugins/live-2016.11.28
new file mode 100644
index 000000000000..cb1470c72375
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/live-2016.11.28
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
+EAPI=5
+HOMEPAGE=http://www.live555.com/
+IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+SLOT=0/7
+SRC_URI=http://www.live555.com/liveMedia/public/live.2016.11.28.tar.gz mirror://gentoo/live.2016.11.28.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=e3792c0d400b5aae0bc2d34113bdc1be
diff --git a/metadata/md5-cache/media-sound/amarok-2.8.0-r3 b/metadata/md5-cache/media-sound/amarok-2.8.0-r3
index d1cbfecf325e..38415279a210 100644
--- a/metadata/md5-cache/media-sound/amarok-2.8.0-r3
+++ b/metadata/md5-cache/media-sound/amarok-2.8.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] >=kde-base/kdelibs-4.8.4:4[aqua=,opengl?] >=kde-apps/kdebase-kioslaves-4.13.1:4[aqua=] >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-apps/libkcddb-4.13.1:4[aqua=] >=kde-apps/libkcompactdisc-4.13.1:4[aqua=] >=kde-apps/audiocd-kio-4.13.1:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 net-libs/loudmouth net-misc/curl >=dev-qt/qtcore-4.8.4:4[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) !media-sound/amarok-utils || ( kde-apps/phonon-kde:4 >=kde-apps/phonon-kde-4.13.1:4[aqua=] ) >=dev-qt/qtwebkit-4.8.5:4
 SLOT=4
 SRC_URI=mirror://kde/stable/amarok/2.8.0/src/amarok-2.8.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3db6d6dd2df0d7a9d7d201336e922a30
diff --git a/metadata/md5-cache/media-sound/amarok-2.8.90-r2 b/metadata/md5-cache/media-sound/amarok-2.8.90-r2
index d73e84eee771..979d3e2394b0 100644
--- a/metadata/md5-cache/media-sound/amarok-2.8.90-r2
+++ b/metadata/md5-cache/media-sound/amarok-2.8.90-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] >=kde-base/kdelibs-4.8.4:4[aqua=,opengl?] >=kde-apps/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-apps/libkcddb-4.4:4[aqua=] >=kde-apps/libkcompactdisc-4.4:4[aqua=] >=kde-apps/audiocd-kio-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 net-libs/loudmouth net-misc/curl >=dev-qt/qtcore-4.8.4:4[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) !media-sound/amarok-utils >=kde-apps/phonon-kde-4.4:4[aqua=] >=dev-qt/qtwebkit-4.8.5:4
 SLOT=4
 SRC_URI=mirror://kde/stable/amarok/2.8.90/src/amarok-2.8.90.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=342f906d537048a009df4156c2e3b963
diff --git a/metadata/md5-cache/media-sound/audex-0.79 b/metadata/md5-cache/media-sound/audex-0.79
index 78301c75f49d..9ca4b2c45393 100644
--- a/metadata/md5-cache/media-sound/audex-0.79
+++ b/metadata/md5-cache/media-sound/audex-0.79
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] >=kde-apps/libkcompactdisc-4.4:4[aqua=] media-sound/cdparanoia kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://gentoo/audex-0.79.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3c5f8513893ea1c3a005adef78033c90
diff --git a/metadata/md5-cache/media-sound/k4guitune-1.1.1 b/metadata/md5-cache/media-sound/k4guitune-1.1.1
index 174ece92efdb..76ff328e6ce6 100644
--- a/metadata/md5-cache/media-sound/k4guitune-1.1.1
+++ b/metadata/md5-cache/media-sound/k4guitune-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/117669-k4guitune-1.1.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d9a219cdef08d69d44758a17bb1c1b8b
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3-r3 b/metadata/md5-cache/media-sound/kaudiocreator-1.3-r3
index e337adf914b1..aadae8a19d7a 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3-r3
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] >=kde-apps/libkcompactdisc-4.4:4[aqua=] media-libs/libdiscid >=media-libs/taglib-1.5 >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] >=kde-apps/audiocd-kio-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/107645-kaudiocreator-1.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=29e3d4a226400db4f36f25fa5ade26dc
diff --git a/metadata/md5-cache/media-sound/kenvy24-1.2 b/metadata/md5-cache/media-sound/kenvy24-1.2
index 5a2647c956da..e898068819db 100644
--- a/metadata/md5-cache/media-sound/kenvy24-1.2
+++ b/metadata/md5-cache/media-sound/kenvy24-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kenvy24/kenvy24-1.2-src.tgz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=12cf36444bd05e9c2239a4c10021b2b7
diff --git a/metadata/md5-cache/media-sound/kid3-3.3.2-r1 b/metadata/md5-cache/media-sound/kid3-3.3.2-r1
index 999dc597dd2a..9343ab0b62b5 100644
--- a/metadata/md5-cache/media-sound/kid3-3.3.2-r1
+++ b/metadata/md5-cache/media-sound/kid3-3.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 sy
 REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-3.3.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d1125cf4e956c1b68d3517b4d7df6f27
diff --git a/metadata/md5-cache/media-sound/kid3-3.4.2 b/metadata/md5-cache/media-sound/kid3-3.4.2
index 83de421f6fea..54cac7dde29f 100644
--- a/metadata/md5-cache/media-sound/kid3-3.4.2
+++ b/metadata/md5-cache/media-sound/kid3-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 sy
 REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-3.4.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f724389f20731349adb63f8a602f923a
diff --git a/metadata/md5-cache/media-sound/kmid-2.4.0-r1 b/metadata/md5-cache/media-sound/kmid-2.4.0-r1
index 9625d7fe3930..e15dc70dc098 100644
--- a/metadata/md5-cache/media-sound/kmid-2.4.0-r1
+++ b/metadata/md5-cache/media-sound/kmid-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.4 <media-sound/drumstick-1.0.0 kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmid2/kmid-2.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=081088078ed3d80cc7ddd81680dbc028
diff --git a/metadata/md5-cache/media-sound/kmidimon-0.7.5 b/metadata/md5-cache/media-sound/kmidimon-0.7.5
index d244677f13ed..cd1ff526039e 100644
--- a/metadata/md5-cache/media-sound/kmidimon-0.7.5
+++ b/metadata/md5-cache/media-sound/kmidimon-0.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.5 <media-sound/drumstick-1.0.0 kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmidimon/kmidimon-0.7.5.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2d03abb4d047845c957373cc02374e6e
diff --git a/metadata/md5-cache/media-sound/konvertible-1.0.1 b/metadata/md5-cache/media-sound/konvertible-1.0.1
index 9729ed3205cb..a172099a0bb1 100644
--- a/metadata/md5-cache/media-sound/konvertible-1.0.1
+++ b/metadata/md5-cache/media-sound/konvertible-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=taglib? ( media-libs/taglib ) virtual/ffmpeg kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/116892-konvertible-1.0.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9f917bf15c8daa86b4e85081beab6c04
diff --git a/metadata/md5-cache/media-sound/kradio-4.0.8 b/metadata/md5-cache/media-sound/kradio-4.0.8
index 620395591b76..87549becb7ac 100644
--- a/metadata/md5-cache/media-sound/kradio-4.0.8
+++ b/metadata/md5-cache/media-sound/kradio-4.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) ffmpeg? ( >=media-libs/libmms-0.4 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kradio/kradio4-4.0.8.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e43bb278c3739fcb65fbecce16a1a9be
diff --git a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2 b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
index 270411658892..0cd5e27d8a9d 100644
--- a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
+++ b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=media-sound/streamripper kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kstreamripper/kstreamripper-0.7.100.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=51bde019209ffee8699457b682886bdc
diff --git a/metadata/md5-cache/media-sound/mpg123-1.23.8 b/metadata/md5-cache/media-sound/mpg123-1.23.8
index 9db5601c252a..cd88235cd925 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.23.8
+++ b/metadata/md5-cache/media-sound/mpg123-1.23.8
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=6
 HOMEPAGE=http://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.23.8.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8f4451c1f53dca7926666d23db15060b
+_md5_=d52476d216a6fe4e9fb93def47bc3124
diff --git a/metadata/md5-cache/media-sound/qtmpc-0.6.1 b/metadata/md5-cache/media-sound/qtmpc-0.6.1
index d4fbd17f8e6d..66798caad2c0 100644
--- a/metadata/md5-cache/media-sound/qtmpc-0.6.1
+++ b/metadata/md5-cache/media-sound/qtmpc-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://files.lowblog.nl/qtmpc/QtMPC-0.6.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=62837312d4d875b941e01b44d099d126
diff --git a/metadata/md5-cache/media-sound/soundkonverter-2.2.2 b/metadata/md5-cache/media-sound/soundkonverter-2.2.2
index 0ab8407018d5..31133e43be88 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-2.2.2
+++ b/metadata/md5-cache/media-sound/soundkonverter-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkcddb-4.4:4[aqua=] media-libs/phonon[qt4] media-libs/taglib media-sound/cdparanoia kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_es-AR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es-AR(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/29024-soundkonverter-2.2.2.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49ec618ef5dd80af7e5ee0bd6c6ce47e
diff --git a/metadata/md5-cache/media-sound/waheela-0.3 b/metadata/md5-cache/media-sound/waheela-0.3
index 8618605c5135..32c1d7545976 100644
--- a/metadata/md5-cache/media-sound/waheela-0.3
+++ b/metadata/md5-cache/media-sound/waheela-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/amarok:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://linux.wuertz.org/dists/sid/main/source/waheela_0.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=58ecb1260ef86f347039bec2f960f721
diff --git a/metadata/md5-cache/media-video/kamerka-0.10 b/metadata/md5-cache/media-video/kamerka-0.10
index 7f4000dae92e..51488d563824 100644
--- a/metadata/md5-cache/media-video/kamerka-0.10
+++ b/metadata/md5-cache/media-video/kamerka-0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdeclarative:4 media-libs/libv4l media-libs/phonon[qt4] media-libs/qimageblitz kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://dosowisko.net/kamerka/downloads/kamerka-0.10.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6b94dabc11c7eb10311d94759aece3dd
diff --git a/metadata/md5-cache/media-video/kplayer-0.7.2-r1 b/metadata/md5-cache/media-video/kplayer-0.7.2-r1
index d71a19cf7e47..bde215400f8d 100644
--- a/metadata/md5-cache/media-video/kplayer-0.7.2-r1
+++ b/metadata/md5-cache/media-video/kplayer-0.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 ) kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kplayer/0.7.2/src/kplayer-0.7.2.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6e9eb1e0cee771f8ea88474ca2e0d44f
diff --git a/metadata/md5-cache/media-video/loopy-0.5.3 b/metadata/md5-cache/media-video/loopy-0.5.3
index e74daf72dd48..7362ad76e51f 100644
--- a/metadata/md5-cache/media-video/loopy-0.5.3
+++ b/metadata/md5-cache/media-video/loopy-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120880-loopy_0.5.3.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=08244f198264753f9a2bd16b7aca5bfa
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.5.6 b/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
index dc2f88db2273..c7d0b85e4ab6 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] gstreamer? ( media-libs/gstreamer:0.10 ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib ) kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.5.6.tar.gz -> subtitlecomposer-0.5.6.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ef1c3c3b6571389c6f103203b2ee8b1
diff --git a/metadata/md5-cache/net-analyzer/bmon-4.0 b/metadata/md5-cache/net-analyzer/bmon-4.0
new file mode 100644
index 000000000000..84741b3f0eba
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bmon-4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=sys-libs/ncurses-5.3-r2:= dev-libs/confuse:= dev-libs/libnl:3 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=interface bandwidth monitor
+EAPI=6
+HOMEPAGE=http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2 MIT
+RDEPEND=>=sys-libs/ncurses-5.3-r2:= dev-libs/confuse:= dev-libs/libnl:3
+SLOT=0
+SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v4.0 -> bmon-4.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4bb702805bd79a706b672a6f36eabf86
diff --git a/metadata/md5-cache/net-analyzer/httping-2.5 b/metadata/md5-cache/net-analyzer/httping-2.5
index 13b1b5b13059..20e8bd35f43b 100644
--- a/metadata/md5-cache/net-analyzer/httping-2.5
+++ b/metadata/md5-cache/net-analyzer/httping-2.5
@@ -4,11 +4,11 @@ DESCRIPTION=http protocol ping-like program
 EAPI=6
 HOMEPAGE=http://www.vanheusden.com/httping/
 IUSE=debug fftw libressl l10n_nl ncurses ssl tfo
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=fftw? ( sci-libs/fftw:3.0 ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vanheusden.com/httping/httping-2.5.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a81586d83b9d4120b36e5b4c4634c2d9
+_md5_=e5773ea849c7e980efde5f97ddccd721
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r3 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r3
index 9c540a6cb6f4..84ebb79a7dc7 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r3
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=5
 HOMEPAGE=http://www.samba.org/ppp
 IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD GPL-2
 PDEPEND=net-dialup/ppp-scripts
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) )
 SLOT=0/2.4.7
 SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-4.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e5905223ee9f8e65d1cae4e02b1f31b0
+_md5_=b120c6d35e13f7cc436e1a13ca350fc2
diff --git a/metadata/md5-cache/net-dns/unbound-1.5.10 b/metadata/md5-cache/net-dns/unbound-1.5.10
index d513a05ac942..8df87184f9d0 100644
--- a/metadata/md5-cache/net-dns/unbound-1.5.10
+++ b/metadata/md5-cache/net-dns/unbound-1.5.10
@@ -4,11 +4,11 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=5
 HOMEPAGE=http://unbound.net/
 IUSE=debug dnstap +ecdsa gost libressl python selinux static-libs test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.5.10.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=001c2fbc06f8bf4fafc23dde6480d1e8
+_md5_=3532a38667015500ea723ffec0894b91
diff --git a/metadata/md5-cache/net-im/choqok-1.5-r1 b/metadata/md5-cache/net-im/choqok-1.5-r1
index bdb70ececbc4..79ec110cf6b3 100644
--- a/metadata/md5-cache/net-im/choqok-1.5-r1
+++ b/metadata/md5-cache/net-im/choqok-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libattica dev-libs/qjson >=dev-libs/qoauth-1.0.1:0 ayatana? ( dev-libs/libindicate-qt ) telepathy? ( net-libs/telepathy-qt[qt4] ) kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sq? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sq(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit?]
 SLOT=4
 SRC_URI=mirror://sourceforge/choqok/choqok-1.5.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a5938d302b7161c62fb50ac6b3b6d830
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
deleted file mode 100644
index ed50b6e5d4d9..000000000000
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby20] dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby21] dev-ruby/rake[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/tokyocabinet[ruby_targets_ruby20] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby20] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby20] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby20] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby20] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby20] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby21] ) ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=A ruby IRC bot
-EAPI=5
-HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls dict figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby20? ( dev-ruby/tokyocabinet[ruby_targets_ruby20] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby20] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby20] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby20] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby20] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby20] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/tokyocabinet[ruby_targets_ruby21] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby21] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby21] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby21] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby21] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby21] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=http://dev.a3li.li/gentoo/distfiles/rbot-0.9.15_p20131020.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e7fa31c01385da6e382e7d0b3fb428d5
diff --git a/metadata/md5-cache/net-libs/libbluedevil-2.1 b/metadata/md5-cache/net-libs/libbluedevil-2.1
index 893eea3c420a..08057236f400 100644
--- a/metadata/md5-cache/net-libs/libbluedevil-2.1
+++ b/metadata/md5-cache/net-libs/libbluedevil-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-5 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/libbluedevil/2.1/src/libbluedevil-2.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3e9406b8f041fb985e434667c5d775e3
diff --git a/metadata/md5-cache/net-libs/libkgapi-2.2.0 b/metadata/md5-cache/net-libs/libkgapi-2.2.0
index a246f3b14c28..25b281904b82 100644
--- a/metadata/md5-cache/net-libs/libkgapi-2.2.0
+++ b/metadata/md5-cache/net-libs/libkgapi-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14:4[aqua=] dev-libs/qjson kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=mirror://kde/stable/libkgapi/2.2.0/src/libkgapi-2.2.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b0a2a1f4badb4687a9e53a179e177f1a
diff --git a/metadata/md5-cache/net-libs/libkpeople-0.3.0 b/metadata/md5-cache/net-libs/libkpeople-0.3.0
index 0d41283af012..52e09c611e5d 100644
--- a/metadata/md5-cache/net-libs/libkpeople-0.3.0
+++ b/metadata/md5-cache/net-libs/libkpeople-0.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-apps/kdepimlibs-4.4:4[aqua=] semantic-desktop? ( kde-frameworks/baloo:4 ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4/4
 SRC_URI=mirror://kde/unstable/libkpeople/0.3.0/src/libkpeople-0.3.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f60229623933b0b436104bb438f64d7
diff --git a/metadata/md5-cache/net-libs/libktorrent-1.3.1 b/metadata/md5-cache/net-libs/libktorrent-1.3.1
index c050783ef309..b307340e3835 100644
--- a/metadata/md5-cache/net-libs/libktorrent-1.3.1
+++ b/metadata/md5-cache/net-libs/libktorrent-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] dev-libs/gmp:0= dev-libs/libgcrypt:0= kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_ast? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ast(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ku? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ku(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_si? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_si(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.3.1/libktorrent-1.3.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a65743d7fb7c135058d77a95660a84d
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-4.12.0 b/metadata/md5-cache/net-libs/libkvkontakte-4.12.0
index bcad95e5859c..150ad3f46bf0 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-4.12.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-4.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/qjson-0.7.0 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/libkvkontakte/4.12.0/src/libkvkontakte-4.12.0.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e5eafc14426eb87d9f7e59efb2a1013
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-4.4.0 b/metadata/md5-cache/net-libs/libkvkontakte-4.4.0
index 98ef8fc98340..a3f42304202f 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-4.4.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.0 kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6679cf9f90bbe9286fdd37bd1a876de5
diff --git a/metadata/md5-cache/net-libs/libmediawiki-4.12.0 b/metadata/md5-cache/net-libs/libmediawiki-4.12.0
index 37b15cf6602b..95eb9403ef2a 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-4.12.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-4.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-4.12.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e508053c7e3adf1a13dabe820275666a
diff --git a/metadata/md5-cache/net-libs/libmediawiki-4.13.0 b/metadata/md5-cache/net-libs/libmediawiki-4.13.0
index 420566d9da5e..4920409dcc7a 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-4.13.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-4.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-4.13.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e508053c7e3adf1a13dabe820275666a
diff --git a/metadata/md5-cache/net-libs/libmediawiki-4.4.0 b/metadata/md5-cache/net-libs/libmediawiki-4.4.0
index 03978503ab84..c62cfebb23be 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-4.4.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/digikam/digikam-4.4.0.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2c471347d1e086dba7642636fd7cf20b
diff --git a/metadata/md5-cache/net-libs/libmm-qt-1.0.1-r1 b/metadata/md5-cache/net-libs/libmm-qt-1.0.1-r1
index d66fd2c42b45..5617fe2419d3 100644
--- a/metadata/md5-cache/net-libs/libmm-qt-1.0.1-r1
+++ b/metadata/md5-cache/net-libs/libmm-qt-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.8[modemmanager]
 SLOT=0
 SRC_URI=mirror://kde/unstable/modemmanager-qt/1.0.1/src/libmm-qt-1.0.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d7c8068a41dd10bef2a0d4725dc36506
diff --git a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.4 b/metadata/md5-cache/net-libs/libnm-qt-0.9.8.4
index 55c229ce58ce..33f6709d9af4 100644
--- a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.4
+++ b/metadata/md5-cache/net-libs/libnm-qt-0.9.8.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info || ( >=net-misc/networkmanager-0.9.8.4[consolekit] >=net-misc/networkmanager-0.9.8.4[systemd] ) modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
 SLOT=0/1
 SRC_URI=mirror://kde/unstable/networkmanager-qt/0.9.8.4/src/networkmanager-qt-0.9.8.4.tar.xz -> libnm-qt-0.9.8.4.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a8f546145eec6ffe0f2ecf63365e6750
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.27 b/metadata/md5-cache/net-mail/dovecot-2.2.27
index 1a51a6168580..82b65c784bd7 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.27
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.27
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 x86
+KEYWORDS=alpha amd64 arm ~hppa ~ppc ~ppc64 ~s390 x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.27.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.16.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.16.tar.gz )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b9ad51c8cb32c76e0a20dd7eb687abc7
+_md5_=f94cec56ee7168f731ed747e0a7345c4
diff --git a/metadata/md5-cache/net-misc/buka-1.0 b/metadata/md5-cache/net-misc/buka-1.0
deleted file mode 100644
index 2c7a966bac7a..000000000000
--- a/metadata/md5-cache/net-misc/buka-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Download manga from buka.cn
-EAPI=6
-HOMEPAGE=https://gitgud.io/drylemon/buka
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-process/parallel net-misc/curl dev-util/dialog
-SLOT=0
-SRC_URI=http://lick.moe/buka/buka-1.0.tar.gz
-_md5_=af5161be97f71fd050b424ec7758070a
diff --git a/metadata/md5-cache/net-misc/buka-2.0 b/metadata/md5-cache/net-misc/buka-2.0
new file mode 100644
index 000000000000..ee4359aab3c7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/buka-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Download manga from buka.cn
+EAPI=6
+HOMEPAGE=https://gitgud.io/drylemon/buka
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=sys-process/parallel net-misc/curl dev-util/dialog
+SLOT=0
+SRC_URI=http://lick.moe/buka/buka-2.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=481163fcba7e82e2fc4ae3adb9a2a7bc
diff --git a/metadata/md5-cache/net-misc/chrony-3.0_pre2 b/metadata/md5-cache/net-misc/chrony-3.0_pre2
new file mode 100644
index 000000000000..a61efbb020b5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-3.0_pre2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DESCRIPTION=NTP client and server programs
+EAPI=6
+HOMEPAGE=http://chrony.tuxfamily.org/
+IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
+KEYWORDS=~amd64 ~hppa ~ppc64
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
+REQUIRED_USE=?? ( libedit readline )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.0-pre2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=8fac48ed97e94cd90c11cdb40afdbe22
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.9 b/metadata/md5-cache/net-misc/iperf-2.0.9
index f97296e40339..b327d834f362 100644
--- a/metadata/md5-cache/net-misc/iperf-2.0.9
+++ b/metadata/md5-cache/net-misc/iperf-2.0.9
@@ -3,8 +3,8 @@ DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
 EAPI=6
 HOMEPAGE=http://iperf2.sourceforge.net/
 IUSE=ipv6 threads debug
-KEYWORDS=~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
 LICENSE=HPND
 SLOT=2
 SRC_URI=mirror://sourceforge/iperf2/iperf-2.0.9.tar.gz
-_md5_=b84ea4bbf7e7ec607898d690730bf64a
+_md5_=28b2cebde3a1ce95fd44da37cb61aaa3
diff --git a/metadata/md5-cache/net-misc/iperf-3.1.3 b/metadata/md5-cache/net-misc/iperf-3.1.3
index 3eb7053cb106..5ece12c3dca7 100644
--- a/metadata/md5-cache/net-misc/iperf-3.1.3
+++ b/metadata/md5-cache/net-misc/iperf-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=6
 HOMEPAGE=https://github.com/esnet/iperf/
 IUSE=sctp static-libs
-KEYWORDS=~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+KEYWORDS=amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
 LICENSE=BSD
 RDEPEND=sctp? ( net-misc/lksctp-tools )
 SLOT=3
 SRC_URI=https://codeload.github.com/esnet/iperf/tar.gz/3.1.3 -> iperf-3.1.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dc9a8f120524a1e8103233f2e2f53a03
+_md5_=9aacf83a0a1b4d7176cbdf55a1403ffb
diff --git a/metadata/md5-cache/net-misc/knemo-0.7.7 b/metadata/md5-cache/net-misc/knemo-0.7.7
index 3f05c84a0416..4abc4b3e93e3 100644
--- a/metadata/md5-cache/net-misc/knemo-0.7.7
+++ b/metadata/md5-cache/net-misc/knemo-0.7.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 dev-qt/qtsql:4[sqlite] kde-plasma/ksysguard:4 kde-plasma/systemsettings:4 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ka(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_rw? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_rw(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/12956-knemo-0.7.7.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ace53be668abdbefed34fefa69c8cfe
diff --git a/metadata/md5-cache/net-misc/knutclient-1.0.5 b/metadata/md5-cache/net-misc/knutclient-1.0.5
index ba20a31ccf0e..20de81157e89 100644
--- a/metadata/md5-cache/net-misc/knutclient-1.0.5
+++ b/metadata/md5-cache/net-misc/knutclient-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/knutclient-1.0.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b9f4b6641b0cd80b524091232f4abd34
diff --git a/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2 b/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2
index 34271b635297..4f0f86e1ee67 100644
--- a/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2
+++ b/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ka(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://download.gna.org/kvpnc/kvpnc-0.9.6a-kde4.tar.bz2 http://download.gna.org/kvpnc/kvpnc-0.9.6-kde4-locale.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=abde15c685e0d475cdad16ebd70c240b
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.14 b/metadata/md5-cache/net-misc/openvpn-2.3.14
new file mode 100644
index 000000000000..89aa96930937
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvpn-2.3.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:* ) libressl? ( dev-libs/libressl ) ) polarssl? ( >=net-libs/polarssl-1.3.8 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
+DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
+EAPI=5
+HOMEPAGE=http://openvpn.net/
+IUSE=examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:* ) libressl? ( dev-libs/libressl ) ) polarssl? ( >=net-libs/polarssl-1.3.8 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
+REQUIRED_USE=static? ( !plugins !pkcs11 ) polarssl? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root )
+SLOT=0
+SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.3.14.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c6c7a961bb60a448010650afbffd1ace
diff --git a/metadata/md5-cache/net-misc/openvpn-2.4_rc1-r2 b/metadata/md5-cache/net-misc/openvpn-2.4_rc2
similarity index 93%
rename from metadata/md5-cache/net-misc/openvpn-2.4_rc1-r2
rename to metadata/md5-cache/net-misc/openvpn-2.4_rc2
index c46e82c6bd27..45fe993dd159 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.4_rc1-r2
+++ b/metadata/md5-cache/net-misc/openvpn-2.4_rc2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) lzo? ( !lz4 ) pkcs11? ( ssl ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
-SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4_rc1.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4_rc1/tests/unit_tests/openvpn/mock_msg.h )
+SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4_rc2.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4_rc2/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b1717dafd501de3623c29526e2686cb
+_md5_=1b5978948c059a28726650880f2738a3
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-misc/openvpn-9999
index 71e5fcae2c59..1e6227e53d63 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-misc/openvpn-9999
@@ -9,4 +9,4 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( s
 REQUIRED_USE=static? ( !plugins !pkcs11 ) lzo? ( !lz4 ) pkcs11? ( ssl ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=637f6f45243888568fd0c74454cd6d0b
+_md5_=b85a1e8e5e0116d7a15fe0df38b37b27
diff --git a/metadata/md5-cache/net-misc/smb4k-1.2.1 b/metadata/md5-cache/net-misc/smb4k-1.2.1
index a61be43bd566..79dc3232e0e2 100644
--- a/metadata/md5-cache/net-misc/smb4k-1.2.1
+++ b/metadata/md5-cache/net-misc/smb4k-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-fs/samba-3.4.2[cups] kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/smb4k/smb4k-1.2.1.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef30fc415db66cd41b5e211b2611e477
diff --git a/metadata/md5-cache/net-misc/stunnel-5.36 b/metadata/md5-cache/net-misc/stunnel-5.36
index dc8f34bb26f1..67e078b5d120 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.36
+++ b/metadata/md5-cache/net-misc/stunnel-5.36
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
-KEYWORDS=alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.36.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.36.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.36.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.36.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.36.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.36.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.36.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=8bb350c8ecd6eedb0a1cc97b3646e1b3
+_md5_=97493d3ba8ccacb6c558719248826c58
diff --git a/metadata/md5-cache/net-misc/vinagre-3.20.2-r1 b/metadata/md5-cache/net-misc/vinagre-3.20.2-r1
index 8da2b1b6547e..b5c5b347f1fd 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.20.2-r1
+++ b/metadata/md5-cache/net-misc/vinagre-3.20.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) >=dev-lang/perl-5 dev-libs/appstream-glib >=dev-util/intltool-0.50 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.34 dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) gnome-base/gnome-common !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) || ( dev-lang/vala:0.34 dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) app-text/yelp-tools >=dev-lang/perl-5 dev-libs/appstream-glib >=dev-util/intltool-0.50 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=d
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.20/vinagre-3.20.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fa2626bbb6eb70560b6123e7d3c70045
+_md5_=3b2991e074620c31802d5de9caef89e9
diff --git a/metadata/md5-cache/net-misc/whois-5.2.12 b/metadata/md5-cache/net-misc/whois-5.2.12
index dad80a78971a..7a1cd1c516d9 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.12
+++ b/metadata/md5-cache/net-misc/whois-5.2.12
@@ -4,11 +4,11 @@ DESCRIPTION=improved Whois Client
 EAPI=5
 HOMEPAGE=http://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.12.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=eb9bbe19a3ebaa0d24f944a3cd183b9e
+_md5_=41dcf6f7b902dbe2d1f120a362e49d9b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.12.01 b/metadata/md5-cache/net-misc/youtube-dl-2016.12.15
similarity index 96%
rename from metadata/md5-cache/net-misc/youtube-dl-2016.12.01
rename to metadata/md5-cache/net-misc/youtube-dl-2016.12.15
index 4a86051149e8..a2073a0c6972 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.12.01
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.12.15
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2016.12.01/youtube-dl-2016.12.01.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2016.12.15/youtube-dl-2016.12.15.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1717eb499b8385be62fe33db44eaf02
diff --git a/metadata/md5-cache/net-nntp/kwooty-1.1.0 b/metadata/md5-cache/net-nntp/kwooty-1.1.0
index 03da02ed877d..9aa77b4b6677 100644
--- a/metadata/md5-cache/net-nntp/kwooty-1.1.0
+++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libkworkspace:4 app-arch/unrar app-arch/par2cmdline kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kwooty/kwooty-1.1.0.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=42456bf56a26cad0774f9c58ad45370a
diff --git a/metadata/md5-cache/net-p2p/kmldonkey-2.0.7 b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
index dc299cf327f8..bee146432220 100644
--- a/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
+++ b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://api.opensuse.org/public/source/home:eduardhc/kmldonkey-kde4/kmldonkey-2.0.7.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ba778394f8f9f611e0b8642cc52f884
diff --git a/metadata/md5-cache/net-p2p/ktorrent-4.3.1-r1 b/metadata/md5-cache/net-p2p/ktorrent-4.3.1-r1
index 626778ed3daa..2cd9db0ff8a1 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-4.3.1-r1
+++ b/metadata/md5-cache/net-p2p/ktorrent-4.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=<net-libs/libktorrent-1.4:4 >=net-libs/libktorrent-1.3.1:4 infowidget? ( dev-libs/geoip ) mediaplayer? ( >=media-libs/taglib-1.5 ) rss? ( >=kde-apps/kdepimlibs-4.4:4[aqua=] ) search? ( >=kde-base/kdelibs-4.14.22:4[aqua=,webkit] dev-qt/qtwebkit:4 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-apps/kdebase-kioslaves-4.4:4[aqua=] ) kross? ( >=kde-base/krosspython-4.4:4[aqua=] ) kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_ast? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ast(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_ku? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ku(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_se(+)] ) l10n_si? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_si(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sq? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sq(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://ktorrent.org/downloads/4.3.1/ktorrent-4.3.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=08ad3089a2056f792d52707b7a3c7d72
diff --git a/metadata/md5-cache/net-voip/ekiga-4.0.1 b/metadata/md5-cache/net-voip/ekiga-4.0.1
index 19e3236658fd..486db7416f67 100644
--- a/metadata/md5-cache/net-voip/ekiga-4.0.1
+++ b/metadata/md5-cache/net-voip/ekiga-4.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24.0:2 >=dev-libs/boost-1.49 dev-libs/libxml2:2 >=net-libs/opal-3.10.9[sip,sound,video,debug=,h323?,xml] >=net-libs/ptlib-2.10.9[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml] >=x11-libs/gtk+-2.20.0:2 >=x11-themes/gnome-icon-theme-3.0.0 avahi? ( >=net-dns/avahi-0.6[dbus] ) dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) gconf? ( >=gnome-base/gconf-2.6.0:2 ) gnome? ( || ( >=x11-libs/gtk+-2.20.0:2 ( >=gnome-base/libgnome-2.14.0 >=gnome-base/libgnomeui-2.14.0 ) ) ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 ) kde? ( kontact? ( >=kde-apps/kdepimlibs-4.4:4[aqua=] ) ) ldap? ( dev-libs/cyrus-sasl:2 net-nds/openldap ) libnotify? ( x11-libs/libnotify ) shm? ( x11-libs/libXext ) xcap? ( net-libs/libsoup:2.4 ) xv? ( x11-libs/libXv ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ekiga/4.0/ekiga-4.0.1.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3a133dbd5743f45fcb088655869c3fe7
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.3 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
index 99ebdc689495..8321758d3e54 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ko(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.3.tgz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=96c4cb48e288de7c649cfa2357ee319f
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
index ca90a25118b9..f8ba6ece31de 100644
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] app-text/ghostscript-gpl app-text/ps2eps dev-texlive/texlive-pstricks media-gfx/dpic media-gfx/pdf2svg media-libs/netpbm virtual/latex-base kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c65dd381c7355f8955efc068d054b996
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.14.5 b/metadata/md5-cache/sci-geosciences/qgis-2.14.5
index c3dad87db500..ffe3b180b793 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-2.14.5
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.14.5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://qgis.org/downloads/qgis-2.14.5.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=48f23b83f032f667e1bf8a2c54303c16
+_md5_=f96a4ce61d85d80ad77d0bd52c12a301
diff --git a/metadata/md5-cache/sci-libs/armadillo-7.500.2 b/metadata/md5-cache/sci-libs/armadillo-7.500.2-r1
similarity index 96%
rename from metadata/md5-cache/sci-libs/armadillo-7.500.2
rename to metadata/md5-cache/sci-libs/armadillo-7.500.2-r1
index 54b9aa5fdabf..a44b8244581b 100644
--- a/metadata/md5-cache/sci-libs/armadillo-7.500.2
+++ b/metadata/md5-cache/sci-libs/armadillo-7.500.2-r1
@@ -9,7 +9,7 @@ LICENSE=MPL-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack )
 REQUIRED_USE=test? ( lapack )
-SLOT=0/6
+SLOT=0/7
 SRC_URI=mirror://sourceforge/arma/armadillo-7.500.2.tar.xz
 _eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8c4e0899f4c996352cb9e64661c3555d
+_md5_=c14bd3af5b51c29219a1a0f65062b61b
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.1 b/metadata/md5-cache/sci-mathematics/rkward-0.6.1
index 953fe7b95571..488ecd9221b2 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.1
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/R >=kde-base/katepart-4.4:4[aqua=] kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rkward/rkward-0.6.1.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9d447988c8d0f3e805db852681bb131a
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.5 b/metadata/md5-cache/sci-mathematics/rkward-0.6.5
index 88b0c4ae199b..de17dfd7398f 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.5
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.6.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-base/katepart-4.4:4[aqua=] dev-lang/R x11-libs/libX11 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=,webkit]
 SLOT=4
 SRC_URI=mirror://kde/stable/rkward/0.6.5/src/rkward-0.6.5.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a5c203b1ef9c5e3b4dcec91102ca632
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.3 b/metadata/md5-cache/sys-apps/baselayout-2.3
index ce8f585dbdfb..279840ab5e8a 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.3
+++ b/metadata/md5-cache/sys-apps/baselayout-2.3
@@ -3,9 +3,9 @@ DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
 IUSE=build kernel_linux
-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=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~williamh/dist/baselayout-2.3.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6dc1d6581e20ae9cbbc45ee2318504e4
+_md5_=8c0e73b8d1093dba4d22b6339fc6029e
diff --git a/metadata/md5-cache/sys-apps/busybox-1.25.1 b/metadata/md5-cache/sys-apps/busybox-1.25.1
index a1ec4c7b294c..1d8f8434e7ca 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.25.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.25.1
@@ -4,7 +4,7 @@ DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=5
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~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 ) mdev? ( !<sys-apps/openrc-0.13 )
 REQUIRED_USE=pam? ( !static )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.25.1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c9fc8164757b48886ea38948abc10753
+_md5_=95a773a612077deb77fcc90e76521fbe
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
index 27d34837f758..0e798ba25fb7 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20160725
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
 EAPI=6
 HOMEPAGE=http://www.lm-sensors.org/ https://github.com/groeck/lm-sensors
 IUSE=sensord static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
 SLOT=0/4.4.0
 SRC_URI=https://github.com/groeck/lm-sensors/archive/45ffa15cf02e63f70ff3b85c23e22dfbab7e8f9c.tar.gz -> lm_sensors-3.4.0_p20160725.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=49623fa7c8e18bf57d97139eb41b9434
+_md5_=67f0096605edc1ab87db73facf5665a4
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.0-r1 b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
index a8d00a3e6370..436f507570a9 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.0-r1
+++ b/metadata/md5-cache/sys-apps/pv-1.6.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pi
 EAPI=5
 HOMEPAGE=http://www.ivarch.com/programs/pv.shtml
 IUSE=debug nls linguas_de linguas_fr linguas_pl linguas_pt
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=36806becf849899f079eae5e303a5cf3
+_md5_=fca00f267e5c65c9d259bd4657b92056
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
index 6bcf9a5a395b..b7361537d2c6 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=5
 HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
 IUSE=debug kerberos +pam sasl test +utils python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.7.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	s6	1466d3a4bcf73111d8952cd1da2dbe4d	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=6c61b64c0af9603d4787b4a054dc842a
+_md5_=f1354a7a77dc0ce1eb61011efb8ec365
diff --git a/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.1-r1 b/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.1-r1
index 0f21c829e80e..6eda28fb06df 100644
--- a/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.1-r1
+++ b/metadata/md5-cache/sys-auth/polkit-kde-agent-0.99.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-auth/polkit-qt-0.103.0[qt4(+)] !sys-auth/polkit-kde kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ar(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_gl(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_kk(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_mr(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_nl(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_sv(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_vi(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/polkit-kde-1_0.99.1.orig.tar.xz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cafc4047094078e29cc43fc6865d98e3
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index 9e7ab3594e5d..3ed7ea9bcd5f 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
 EAPI=6
 HOMEPAGE=http://h18000.www1.hp.com/products/servers/linux/documentation.html
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ccce6874303ab94ef279b11883943bb3
+_md5_=c8f85c0d2a2f9a8ef93b9327aa158d6a
diff --git a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1 b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
index e4f793063a25..5e6c1b580dd6 100644
--- a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
+++ b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)
 EAPI=6
 HOMEPAGE=http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_04bffb688a73438598fef81ddd
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hpssacli-2.40-13.0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hpssacli-2.40-13.0.i386.rpm )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b89e40ee1ac7ffb2aa7784f422ae602f
+_md5_=408246223de1abb2d3c44493ca870941
diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.9 b/metadata/md5-cache/sys-block/kvpm-0.9.9
index d5694dbd2352..c4d32157d294 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.9
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.98 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.9.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f12b07912c94021a6ebc642d1bce3b09
diff --git a/metadata/md5-cache/sys-block/storcli-1.19.04 b/metadata/md5-cache/sys-block/storcli-1.19.04
index 9a505ebac619..8cce560da9d0 100644
--- a/metadata/md5-cache/sys-block/storcli-1.19.04
+++ b/metadata/md5-cache/sys-block/storcli-1.19.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
 EAPI=6
 HOMEPAGE=http://www.avagotech.com/support/download-search?dnd-keyword=storcli
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=Avago LSI BSD
 SLOT=0/6.11
 SRC_URI=http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip -> storcli-1.19.04.zip
 _eclasses_=pax-utils	4c2654a34ebe732e85fda354f6ee642f
-_md5_=b386ca0d6368013ad9faaa1860ec0857
+_md5_=4cf070459f42aa436ad6d03d7775f043
diff --git a/metadata/md5-cache/sys-cluster/heat-2016.2.9999 b/metadata/md5-cache/sys-cluster/heat-2016.2.9999
index 824269435d36..29b0a7a255ac 100644
--- a/metadata/md5-cache/sys-cluster/heat-2016.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2016.2.9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0 >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a701ce0e67499f73c59822d6f1ffed30
+_md5_=169a4f5b5e6d41c1ce6227f58d0121d7
diff --git a/metadata/md5-cache/sys-cluster/heat-7.0.0-r1 b/metadata/md5-cache/sys-cluster/heat-7.0.0-r1
deleted file mode 100644
index 7d17cb84890b..000000000000
--- a/metadata/md5-cache/sys-cluster/heat-7.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
-EAPI=6
-HOMEPAGE=https://launchpad.net/heat
-IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/heat/heat-7.0.0.tar.gz
-_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=899b69a79d8dc679ecd7cf15a9396dc9
diff --git a/metadata/md5-cache/sys-cluster/heat-7.0.1 b/metadata/md5-cache/sys-cluster/heat-7.0.1
index 364c394ac25f..4b86a0d25478 100644
--- a/metadata/md5-cache/sys-cluster/heat-7.0.1
+++ b/metadata/md5-cache/sys-cluster/heat-7.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration eng
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/heat/heat-7.0.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=70548390e12540c4fcd08b28b11892d9
+_md5_=baa328e46ba5c2602826f6409c77b357
diff --git a/metadata/md5-cache/sys-devel/bmake-20160315 b/metadata/md5-cache/sys-devel/bmake-20160315
deleted file mode 100644
index 5878083b2366..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20160315
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=NetBSD's portable make
-EAPI=5
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~x86 ~x64-freebsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20160315.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20151111.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e66220e8630af45a73f5775dd23ebbe6
diff --git a/metadata/md5-cache/sys-devel/bmake-20160818 b/metadata/md5-cache/sys-devel/bmake-20160818
deleted file mode 100644
index 6cdbd967df78..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20160818
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=NetBSD's portable make
-EAPI=5
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~x86 ~x64-freebsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20160818.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20151111.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4b1eb8ea4bfcf1da0edb5581fc14a32a
diff --git a/metadata/md5-cache/sys-devel/bmake-20160606 b/metadata/md5-cache/sys-devel/bmake-20161126
similarity index 87%
rename from metadata/md5-cache/sys-devel/bmake-20160606
rename to metadata/md5-cache/sys-devel/bmake-20161126
index f71ad3fa60df..c1f5d523049d 100644
--- a/metadata/md5-cache/sys-devel/bmake-20160606
+++ b/metadata/md5-cache/sys-devel/bmake-20161126
@@ -5,6 +5,6 @@ HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
 KEYWORDS=~amd64 ~ppc ~x86 ~x64-freebsd
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20160606.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20151111.tar.gz
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20161126.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20151111.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=4b1eb8ea4bfcf1da0edb5581fc14a32a
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.9_p20161219 b/metadata/md5-cache/sys-fs/aufs-headers-4.9_p20161219
new file mode 100644
index 000000000000..d3f81aa01186
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs-headers-4.9_p20161219
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=User space headers for aufs3
+EAPI=6
+HOMEPAGE=http://aufs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.9_p20161219.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f051d8e6ca0cd62963726a96ba5892de
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20161219 b/metadata/md5-cache/sys-fs/aufs4-0_pre20161219
new file mode 100644
index 000000000000..258b582de23d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20161219
@@ -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=6
+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 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20161219.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b8ae518fdd9a3d20648011b6dd6bbaeb
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r1
index bead7442b924..9e0239868911 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r1
@@ -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:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=072e681e93702730b4fd1c32f352f1d9
+_md5_=520757554827ed993f3cb366a9579150
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2
index a61c2cde99da..74650b729535 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating compressed filesystem type squashfs
 EAPI=5
 HOMEPAGE=http://squashfs.sourceforge.net
 IUSE=debug lz4 lzma lzo static xattr +xz
-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=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-3.debian.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1dfbbe1423b829c631cf89fb295dc355
+_md5_=3b0e1a07a83647785431fb273a0eaa8e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.45 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.45
deleted file mode 100644
index eda52733b8d0..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.45
+++ /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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-3*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.45
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.25+_p20160822.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-44.base.tar.xz mirror://gentoo/genpatches-3.18-44.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-44.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=503b6136ab79a5fcd792803826a17e4a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.35 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.35
deleted file mode 100644
index e33cbdfca0ec..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.35
+++ /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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.35
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-38.base.tar.xz mirror://gentoo/genpatches-4.4-38.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-38.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4fc3a061ea503928b0d2a55831a5ac53
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36
deleted file mode 100644
index fdde99d7593f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36
+++ /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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.36
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-39.base.tar.xz mirror://gentoo/genpatches-4.4-39.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-39.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=10d1f3c0eeb49b329fb939631a3db843
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36-r1
deleted file mode 100644
index 07bd51dba179..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36-r1
+++ /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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.36-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-40.base.tar.xz mirror://gentoo/genpatches-4.4-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-40.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7d2a390a03a2d155f49d6945fb78a9c3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.37 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.39
similarity index 99%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.4.37
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.4.39
index d3c7d467e564..31300a9ce874 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.37
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.39
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.37
+SLOT=4.4.39
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-41.base.tar.xz mirror://gentoo/genpatches-4.4-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-41.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77a76e781bcf3afaef7906699f5a8ec5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.14
similarity index 77%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.8.13
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.8.14
index ae167f8f7658..1b3c5cbbd256 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.14
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.8.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-15.base.tar.xz mirror://gentoo/genpatches-4.8-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-15.experimental.tar.xz ) )
+SLOT=4.8.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-16.base.tar.xz mirror://gentoo/genpatches-4.8-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-16.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d29ec0188a2327d7cc4e33c78a74cf01
+_md5_=d2fde508189d11323ca9b38638290f15
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.12-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.15
similarity index 76%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.8.12-r1
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.8.15
index 91b02dd95043..f25d30c1b3c6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.12-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.15
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.8.12-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-14.base.tar.xz mirror://gentoo/genpatches-4.8-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-14.experimental.tar.xz ) )
+SLOT=4.8.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-17.base.tar.xz mirror://gentoo/genpatches-4.8-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-17.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=260c3c1397575270a0382ab37dfdaee4
+_md5_=05374e6c40c95a3411a1a753ebf5ac4f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.34 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.0
similarity index 72%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.4.34
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.9.0
index cd820844dd95..de6b1ecd611f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.34
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.0
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.34
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-36.base.tar.xz mirror://gentoo/genpatches-4.4-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-36.experimental.tar.xz ) )
+SLOT=4.9.0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20161219.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-1.base.tar.xz mirror://gentoo/genpatches-4.9-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-1.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f3e9d1a7c07a8ff2d23555854b65268a
+_md5_=3b62b29e9ab9ec7beb85f743d7f0dab5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.101 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.101
deleted file mode 100644
index 94df24da7c61..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.101
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.101
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-106.base.tar.xz mirror://gentoo/genpatches-3.10-106.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-106.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=12bd528ddb0d2ab2ff48a2cf79875c45
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.102 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.102
deleted file mode 100644
index 1c5e03233f15..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.102
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.102
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-107.base.tar.xz mirror://gentoo/genpatches-3.10-107.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-107.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ba76ac68c286163aee030582f499440a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.103 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.103
deleted file mode 100644
index bfb4542a56bf..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.103
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.103
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-108.base.tar.xz mirror://gentoo/genpatches-3.10-108.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-108.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3b67ac7c7da7a34732341b8144bda818
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104-r1
index 8a5cd5315518..62b914a48017 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.104-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.104-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-110.base.tar.xz mirror://gentoo/genpatches-3.10-110.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-110.experimental.tar.xz )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3be70a7f22b05d30c1d94f5b79c3343f
+_md5_=6c5c3b1c2be3f73b2dc8b5f8ba0dfb75
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63
deleted file mode 100644
index 5d3d59597fc2..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.63
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-62.base.tar.xz mirror://gentoo/genpatches-3.12-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-62.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7349cc2eb332b0a33869883c624dd364
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
index b309102c6d16..3191a4d76a09 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.66
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-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 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.12.66
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-63.base.tar.xz mirror://gentoo/genpatches-3.12-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-63.experimental.tar.xz )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fef142c8fc39c5be8b52875c4457c6a0
+_md5_=65874a7c2014931b5f40019e304336af
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.67 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.67
deleted file mode 100644
index 011afcdbef79..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.67
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.67
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-64.base.tar.xz mirror://gentoo/genpatches-3.12-64.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-64.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=607ab8b4d6bd61227bf8d2d02b45081b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.68 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.68
deleted file mode 100644
index e505cda92200..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.68
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.68
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-65.base.tar.xz mirror://gentoo/genpatches-3.12-65.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-65.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aae4629621b65315eb1c7d668a18edbb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.79 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.79
deleted file mode 100644
index fb8d340ca224..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.79
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.79
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-86.base.tar.xz mirror://gentoo/genpatches-3.14-86.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-86.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2b00f12c3e74028a98fb0e02019e0dc6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.42 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.42
deleted file mode 100644
index 2db4f2544273..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.42
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.42
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-41.base.tar.xz mirror://gentoo/genpatches-3.18-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-41.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d9765b89f7a28c653c0731c30a501d72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.43 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.43
deleted file mode 100644
index 6aeb21a189cd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.43
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.43
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-42.base.tar.xz mirror://gentoo/genpatches-3.18-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-42.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=161b447d021333771d2a5c92b6cbf81e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
index 8837f2b69744..70bd48c6c5d0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.18.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-43.base.tar.xz mirror://gentoo/genpatches-3.18-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-43.experimental.tar.xz )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=93f9fac88f55607cb8b97db207351ea9
+_md5_=29eb5e070a4be5024543e25af3c358fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.45
deleted file mode 100644
index e3d269bc1bde..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.45
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.45
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-44.base.tar.xz mirror://gentoo/genpatches-3.18-44.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-44.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6a1ad24700dc7905fd5c3816d480e7f6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.112 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.112
deleted file mode 100644
index cea81b6c7564..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.112
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=deblob symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.4.112
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-95.base.tar.xz mirror://gentoo/genpatches-3.4-95.extras.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f011a952a92ae3be0f50cba3a72689d3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.36 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.36
deleted file mode 100644
index b1a6a7403727..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.36
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.36
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-41.base.tar.xz mirror://gentoo/genpatches-4.1-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-41.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bacd2c415e951172136b6ec2ab14deff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.34 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.34
deleted file mode 100644
index 221ce00bf2a4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.34
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.34
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-36.base.tar.xz mirror://gentoo/genpatches-4.4-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-36.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c5e9c0fa89c2d05aaa73755adc64e38d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.35 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.35
deleted file mode 100644
index 05dbed65f41e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.35
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.35
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-38.base.tar.xz mirror://gentoo/genpatches-4.4-38.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-38.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8a0f11d74f91d842786703411b2e32e5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36
deleted file mode 100644
index 7a68ad1d59b9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.36
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-39.base.tar.xz mirror://gentoo/genpatches-4.4-39.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-39.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=50020afd1e7d3c2569c30e0413799d1a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36-r1
deleted file mode 100644
index 164e85cef6f0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.36-r1
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.36-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-40.base.tar.xz mirror://gentoo/genpatches-4.4-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-40.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0ec586692b1622dd7c1c1789b128386d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.37 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.37
deleted file mode 100644
index f54f4b28fc4b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.37
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.37
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-41.base.tar.xz mirror://gentoo/genpatches-4.4-41.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-41.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bacd2c415e951172136b6ec2ab14deff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.38 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.38
deleted file mode 100644
index 8688618f1a2b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.38
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.38
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-42.base.tar.xz mirror://gentoo/genpatches-4.4-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-42.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6056566f61161b5dad964ff887cb6f9b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.12-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.12-r1
deleted file mode 100644
index 0ff3cd653068..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.12-r1
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.8 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.12-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz mirror://gentoo/genpatches-4.8-14.base.tar.xz mirror://gentoo/genpatches-4.8-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-14.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ad3a06a9269dc2353d99d7953f30cd5d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.13
deleted file mode 100644
index 34c991a97610..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.8.13
+++ /dev/null
@@ -1,14 +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 )
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.8 kernel tree
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz mirror://gentoo/genpatches-4.8-15.base.tar.xz mirror://gentoo/genpatches-4.8-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-15.experimental.tar.xz )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=689a6cb3880a67c292c159fd99044dfa
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.8.15 b/metadata/md5-cache/sys-kernel/hardened-sources-4.8.15
new file mode 100644
index 000000000000..c17724439ee1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.8.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 4.8)
+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 )
+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=4.8.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-4.8 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-check -> deblob-check-4.8 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.8.15-1.extras.tar.bz2 mirror://gentoo/genpatches-4.8-13.base.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	8f1d31dfe46471aa29c5cb8a7c9f6264	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=dbb72edcff9b7ef7d612769e07d6ce68
diff --git a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7 b/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
index ee0681d4808c..82de4d6d8019 100644
--- a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
+++ b/metadata/md5-cache/sys-power/pm-utils-1.4.1-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Suspend and hibernation utilities
 EAPI=5
 HOMEPAGE=https://pm-utils.freedesktop.org/
 IUSE=alsa debug ntp video_cards_intel video_cards_radeon
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!<app-laptop/laptop-mode-tools-1.55-r1 !sys-power/powermgmt-base[-pm-utils(+)] sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks alsa? ( media-sound/alsa-utils ) ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) amd64? ( !video_cards_intel? ( sys-apps/vbetool ) ) x86? ( !video_cards_intel? ( sys-apps/vbetool ) ) video_cards_radeon? ( app-laptop/radeontool )
 SLOT=0
 SRC_URI=https://pm-utils.freedesktop.org/releases/pm-utils-1.4.1.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0e4c985b38dec2fac8aa0154f112486b
+_md5_=e6814bc38d422714f48b58ea4f3662ae
diff --git a/metadata/md5-cache/sys-process/watchpid-0.1-r1 b/metadata/md5-cache/sys-process/watchpid-0.1-r1
deleted file mode 100644
index 1eb2f2b5a823..000000000000
--- a/metadata/md5-cache/sys-process/watchpid-0.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Watches a process for termination
-EAPI=0
-HOMEPAGE=http://www.codepark.org/
-KEYWORDS=x86 amd64 -ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/watchpid_0.1.tar.gz
-_md5_=88167fbfdf691d30f7b4b6be92a7bff4
diff --git a/metadata/md5-cache/sys-process/watchpid-0.1-r2 b/metadata/md5-cache/sys-process/watchpid-0.1-r2
index dc5fc457e5d8..4d4b095798f1 100644
--- a/metadata/md5-cache/sys-process/watchpid-0.1-r2
+++ b/metadata/md5-cache/sys-process/watchpid-0.1-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Watches a process for termination
 EAPI=6
 HOMEPAGE=http://www.codepark.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 -ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/watchpid_0.1.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=749cbee490798c411cd07dd2745838d2
+_md5_=ac1f496787955109076c19efea69c0c5
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.40.100_rc-r1 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.40.100_rc-r1
index 2815570a8ab0..9b2a997fcd67 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.40.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.40.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=6
-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
+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.24.1* =dev-lang/perl-5.22.3* ~perl-core/Archive-Tar-2.40.100_rc ) dev-lang/perl:= !<perl-core/Archive-Tar-2.40.100_rc !>perl-core/Archive-Tar-2.40.100_rc-r999
 SLOT=0
-_md5_=e4ff06651eeded9f341d7aa674fb2e53
+_md5_=87e872241ec5cd48e0bb6c686e86566a
diff --git a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r3 b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r3
index 2b8066eadc8a..87783c5ed7c2 100644
--- a/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r3
+++ b/metadata/md5-cache/virtual/perl-AutoLoader-5.740.0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for AutoLoader
 EAPI=6
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/AutoLoader-5.740.0 ) dev-lang/perl:= !<perl-core/AutoLoader-5.740.0 !>perl-core/AutoLoader-5.740.0-r999
 SLOT=0
-_md5_=683f01bd23e4fedd717d15d6f739533e
+_md5_=dc4af852cf6f6bb6e03c3602c88ec309
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.110.100_rc-r1 b/metadata/md5-cache/virtual/perl-CPAN-2.110.100_rc-r1
index 856490510415..05bdd6661842 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.110.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.110.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 EAPI=6
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/CPAN-2.110.100_rc ) dev-lang/perl:= !<perl-core/CPAN-2.110.100_rc !>perl-core/CPAN-2.110.100_rc-r999
 SLOT=0
-_md5_=f0a50dc53f1fd4dfe0f9fa50508acd6b
+_md5_=41ac6e527f53eddcc2c5e27e2c65ba3c
diff --git a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r1 b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r1
index 26d144511221..97e72f2f6ea9 100644
--- a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest
 EAPI=6
-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
+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.24.1* =dev-lang/perl-5.22.3* ~perl-core/Digest-1.170.100_rc ) dev-lang/perl:= !<perl-core/Digest-1.170.100_rc !>perl-core/Digest-1.170.100_rc-r999
 SLOT=0
-_md5_=e4ff06651eeded9f341d7aa674fb2e53
+_md5_=87e872241ec5cd48e0bb6c686e86566a
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-5.950.100_rc-r1 b/metadata/md5-cache/virtual/perl-Digest-SHA-5.950.100_rc-r1
index ee0a4e271adc..b7b99d0c2d0d 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-5.950.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-5.950.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=6
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/Digest-SHA-5.950.100_rc ) dev-lang/perl:= !<perl-core/Digest-SHA-5.950.100_rc !>perl-core/Digest-SHA-5.950.100_rc-r999
 SLOT=0
-_md5_=680f173e214eef8522d931f0da912ee2
+_md5_=25849f631576844ab3ea65995cd907c8
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.200.100_rc b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.200.100_rc
index e696aed60cc7..9f844a8dbc77 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.200.100_rc
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.200.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
 EAPI=5
-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
+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.22.3* ~perl-core/ExtUtils-Command-1.200.100_rc ) dev-lang/perl:= !<perl-core/ExtUtils-Command-1.200.100_rc !>perl-core/ExtUtils-Command-1.200.100_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r9 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r9
index e63e7b91f308..9a48a6b299cd 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r9
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.230.0-r9
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Constant
 EAPI=6
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/ExtUtils-Constant-0.230.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Constant-0.230.0 !>perl-core/ExtUtils-Constant-0.230.0-r999
 SLOT=0
-_md5_=73545807f54489349bf0b613dddea93a
+_md5_=cad6474664dec405a40be1c3fe11d4cd
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.40.200_rc b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.40.200_rc
index c3d62b387853..eccd42843be3 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.40.200_rc
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.40.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=5
-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
+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.22.3* ~perl-core/ExtUtils-MakeMaker-7.40.200_rc ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.40.200_rc !>perl-core/ExtUtils-MakeMaker-7.40.200_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.120.100_rc-r1 b/metadata/md5-cache/virtual/perl-File-Path-2.120.100_rc-r1
index f8923dec0cec..7428871ce3d6 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.120.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.120.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~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
 RDEPEND=|| ( =dev-lang/perl-5.24* ~perl-core/File-Path-2.120.100_rc ) dev-lang/perl:= !<perl-core/File-Path-2.120.100_rc !>perl-core/File-Path-2.120.100_rc-r999
 SLOT=0
-_md5_=aaa90904c34b44cb8f55b8d6897b1535
+_md5_=ec51c7743ea913e9a5f7ee8250a0f92e
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r4 b/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r4
index 379f6027f17c..5af5ede64ae7 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r4
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.90.0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~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
 RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/File-Path-2.90.0 ) dev-lang/perl:= !<perl-core/File-Path-2.90.0 !>perl-core/File-Path-2.90.0-r999
 SLOT=0
-_md5_=027d12e27d5ce0fc721c534bd6231c61
+_md5_=f8ab8e871a470d10ff51e1c9cf87901f
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.560.200_rc b/metadata/md5-cache/virtual/perl-File-Spec-3.560.200_rc
index 053cfc96539a..bed593837cf9 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.560.200_rc
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.560.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=5
-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
+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.22.3* ~perl-core/File-Spec-3.560.200_rc ) dev-lang/perl:= !<perl-core/File-Spec-3.560.200_rc !>perl-core/File-Spec-3.560.200_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.54.10_rc b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.54.10_rc
index 66b8532bdccf..fdb299a8451e 100644
--- a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.54.10_rc
+++ b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.54.10_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for HTTP-Tiny
 EAPI=5
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=|| ( =dev-lang/perl-5.22.3* ~perl-core/HTTP-Tiny-0.54.10_rc ) dev-lang/perl:= !<perl-core/HTTP-Tiny-0.54.10_rc !>perl-core/HTTP-Tiny-0.54.10_rc-r999
 SLOT=0
-_md5_=a89e32c25dd85381c46944845c78371e
+_md5_=5655f074b8f0deebdb59b8ad3127c399
diff --git a/metadata/md5-cache/virtual/perl-IO-1.350.100_rc b/metadata/md5-cache/virtual/perl-IO-1.350.100_rc
index 270ce90604a7..bbd71f649c2a 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.350.100_rc
+++ b/metadata/md5-cache/virtual/perl-IO-1.350.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=5
-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
+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.22.3* ~perl-core/IO-1.350.100_rc ) dev-lang/perl:= !<perl-core/IO-1.350.100_rc !>perl-core/IO-1.350.100_rc-r999
 SLOT=0
-_md5_=ecb1523e2a671360dc23e2df9ac2e62e
+_md5_=27eff0e6f7421c81476aca02e087c5ce
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.68.1_rc b/metadata/md5-cache/virtual/perl-IO-Compress-2.68.1_rc
index 322b9a0b7546..d75709aebff6 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.68.1_rc
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.68.1_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=5
-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
+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.22.3* ~perl-core/IO-Compress-2.68.1_rc ) dev-lang/perl:= !<perl-core/IO-Compress-2.68.1_rc !>perl-core/IO-Compress-2.68.1_rc-r999 >=virtual/perl-Compress-Raw-Zlib-2.68.0 >=virtual/perl-Compress-Raw-Bzip2-2.68.0
 SLOT=0
-_md5_=7ff8e4c8be18f10a98599933688b277a
+_md5_=6300dc065746c5e4333a7c12643fc1b6
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.100_rc-r1 b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.100_rc-r1
index 2400eb2524b1..0ffde00505b9 100644
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IPC-Cmd
 EAPI=6
-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
+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.24.1* =dev-lang/perl-5.22.3* ~perl-core/IPC-Cmd-0.920.100_rc ) dev-lang/perl:= !<perl-core/IPC-Cmd-0.920.100_rc !>perl-core/IPC-Cmd-0.920.100_rc-r999
 SLOT=0
-_md5_=e4ff06651eeded9f341d7aa674fb2e53
+_md5_=87e872241ec5cd48e0bb6c686e86566a
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.273.0.100_rc-r1 b/metadata/md5-cache/virtual/perl-JSON-PP-2.273.0.100_rc-r1
index acc476ece82b..c428edf006a3 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.273.0.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.273.0.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=6
-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
+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.24.1* =dev-lang/perl-5.22.3* ~perl-core/JSON-PP-2.273.0.100_rc ) dev-lang/perl:= !<perl-core/JSON-PP-2.273.0.100_rc !>perl-core/JSON-PP-2.273.0.100_rc-r999
 SLOT=0
-_md5_=e4ff06651eeded9f341d7aa674fb2e53
+_md5_=87e872241ec5cd48e0bb6c686e86566a
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r1 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r1
index 5261dde95d6d..1068800d9371 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/Locale-Maketext-1.260.100_rc ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.260.100_rc !>perl-core/Locale-Maketext-1.260.100_rc-r999
 SLOT=0
-_md5_=4cd65e61a211450258549f08b7aa2205
+_md5_=b5a74c5daef6df891ff497c03c18d84e
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r1 b/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r1
index 262d5a78f38f..bd76c55e87f6 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-Simple-0.210.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext-Simple
 EAPI=6
-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
+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.24.1* =dev-lang/perl-5.22.3* ~perl-core/Locale-Maketext-Simple-0.210.100_rc ) dev-lang/perl:= !<perl-core/Locale-Maketext-Simple-0.210.100_rc !>perl-core/Locale-Maketext-Simple-0.210.100_rc-r999
 SLOT=0
-_md5_=e4ff06651eeded9f341d7aa674fb2e53
+_md5_=87e872241ec5cd48e0bb6c686e86566a
diff --git a/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r1 b/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r1
index 58b0dac912f7..5c8e9fd8685c 100644
--- a/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Memoize
 EAPI=6
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/Memoize-1.30.100_rc ) dev-lang/perl:= !<perl-core/Memoize-1.30.100_rc !>perl-core/Memoize-1.30.100_rc-r999
 SLOT=0
-_md5_=76ec1e30f91c3fce9837d21c43c97ae4
+_md5_=0c085c370c0f37d4f7cde1c2df172932
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.610.192.200_rc b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.610.192.200_rc
index 96023f46283a..518156f9f183 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.610.192.200_rc
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.610.192.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=5
-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
+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.22.3* ~perl-core/Module-CoreList-5.201.610.192.200_rc ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.610.192.200_rc !>perl-core/Module-CoreList-5.201.610.192.200_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r7 b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r7
index f654cf0d8766..74108904c918 100644
--- a/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r7
+++ b/metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Loaded
 EAPI=6
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Module-Loaded-0.80.0 ) dev-lang/perl:= !<perl-core/Module-Loaded-0.80.0 !>perl-core/Module-Loaded-0.80.0-r999
 SLOT=0
-_md5_=4114931b8a16834b3976061d5b56a3fe
+_md5_=f8939e06a7a55e8578c290417d45a0b2
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.430.100_rc-r1 b/metadata/md5-cache/virtual/perl-Net-Ping-2.430.100_rc-r1
index 6b9797ceea0d..3dd7145b6052 100644
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.430.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.430.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Net-Ping
 EAPI=6
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/Net-Ping-2.430.100_rc ) dev-lang/perl:= !<perl-core/Net-Ping-2.430.100_rc !>perl-core/Net-Ping-2.430.100_rc-r999
 SLOT=0
-_md5_=2ec9cd1f2b3e92900f89a5e23808d523
+_md5_=cadf8da68b9859616426109ff7a25423
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400.100_rc b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400.100_rc
index ad8af2b0406c..bbbcf9453475 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400.100_rc
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
 EAPI=5
-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
+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.22.3* ~perl-core/Parse-CPAN-Meta-1.441.400.100_rc ) dev-lang/perl:= !<perl-core/Parse-CPAN-Meta-1.441.400.100_rc !>perl-core/Parse-CPAN-Meta-1.441.400.100_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.390.0-r2 b/metadata/md5-cache/virtual/perl-Safe-2.390.0-r2
index 0e597438a00b..7674415091e0 100644
--- a/metadata/md5-cache/virtual/perl-Safe-2.390.0-r2
+++ b/metadata/md5-cache/virtual/perl-Safe-2.390.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Safe
 EAPI=6
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* ~perl-core/Safe-2.390.0 ) dev-lang/perl:= !<perl-core/Safe-2.390.0 !>perl-core/Safe-2.390.0-r999
 SLOT=0
-_md5_=b8646a92fb520b553f2fefc8e44a62d8
+_md5_=06b87196718e628f94b1c60a78b5f696
diff --git a/metadata/md5-cache/virtual/perl-Storable-2.530.200_rc b/metadata/md5-cache/virtual/perl-Storable-2.530.200_rc
index 0cf75d3e4686..13ba414f4947 100644
--- a/metadata/md5-cache/virtual/perl-Storable-2.530.200_rc
+++ b/metadata/md5-cache/virtual/perl-Storable-2.530.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=6
-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
+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.22.3* ~perl-core/Storable-2.530.200_rc ) dev-lang/perl:= !<perl-core/Storable-2.530.200_rc !>perl-core/Storable-2.530.200_rc-r999
 SLOT=0
-_md5_=66417575e1a6b78e4f6f7c64182e1055
+_md5_=e51ec96523baaf80972b6306ec1bf184
diff --git a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.100_rc-r1 b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.100_rc-r1
index 81a0fadfd647..8657f9436c52 100644
--- a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.100_rc-r1
+++ b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.100_rc-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Sys-Syslog
 EAPI=6
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.24.1* =dev-lang/perl-5.22.3* ~perl-core/Sys-Syslog-0.330.100_rc ) dev-lang/perl:= !<perl-core/Sys-Syslog-0.330.100_rc !>perl-core/Sys-Syslog-0.330.100_rc-r999
 SLOT=0
-_md5_=0c9192d5290b5375c068ac405cffccca
+_md5_=4dc9169511244edfcf242fa83118c89c
diff --git a/metadata/md5-cache/virtual/perl-Test-1.260.100_rc b/metadata/md5-cache/virtual/perl-Test-1.260.100_rc
index fd729e17bdac..27432845927e 100644
--- a/metadata/md5-cache/virtual/perl-Test-1.260.100_rc
+++ b/metadata/md5-cache/virtual/perl-Test-1.260.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test
 EAPI=5
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.22.3* ~perl-core/Test-1.260.100_rc ) dev-lang/perl:= !<perl-core/Test-1.260.100_rc !>perl-core/Test-1.260.100_rc-r999
 SLOT=0
-_md5_=33e39bf1cfb3b1df86c8352e280cd74a
+_md5_=3877d3c587d557dcaddf7449e22c09f2
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.350.100_rc b/metadata/md5-cache/virtual/perl-Test-Harness-3.350.100_rc
index 01c6610a40fa..f38017845597 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.350.100_rc
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.350.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=5
-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 ~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 ~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
 RDEPEND=|| ( =dev-lang/perl-5.22.3* ~perl-core/Test-Harness-3.350.100_rc ) dev-lang/perl:= !<perl-core/Test-Harness-3.350.100_rc !>perl-core/Test-Harness-3.350.100_rc-r999
 SLOT=0
-_md5_=0cab8ed8bbed63422a730fd0a6c09eac
+_md5_=32b9ddce026655c2f54858f7b9596568
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0-r2 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0-r2
index 5160a9bfb5b2..f5259d7e2ad8 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0-r2
+++ b/metadata/md5-cache/virtual/perl-Thread-Queue-3.50.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Queue
 EAPI=5
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Thread-Queue-3.50.0 ) dev-lang/perl:= !<perl-core/Thread-Queue-3.50.0 !>perl-core/Thread-Queue-3.50.0-r999
 SLOT=0
-_md5_=cc86cead890d213be4fb8eddf0154a7f
+_md5_=aa753dfd1dd89ea1d1048f2bb0a35298
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r7 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r7
index 2d5a9cba0e40..3d25f5029f5a 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r7
+++ b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.120.0-r7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Semaphore
 EAPI=6
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Thread-Semaphore-2.120.0 ) dev-lang/perl:= !<perl-core/Thread-Semaphore-2.120.0 !>perl-core/Thread-Semaphore-2.120.0-r999
 SLOT=0
-_md5_=4114931b8a16834b3976061d5b56a3fe
+_md5_=f8939e06a7a55e8578c290417d45a0b2
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r6 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r6
index ec4b7e7d5552..5544fc24df36 100644
--- a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r6
+++ b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r6
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Tie-RefHash
 EAPI=6
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.24* =dev-lang/perl-5.22* =dev-lang/perl-5.20* ~perl-core/Tie-RefHash-1.390.0 ) dev-lang/perl:= !<perl-core/Tie-RefHash-1.390.0 !>perl-core/Tie-RefHash-1.390.0-r999
 SLOT=0
-_md5_=4114931b8a16834b3976061d5b56a3fe
+_md5_=f8939e06a7a55e8578c290417d45a0b2
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.290.0-r1 b/metadata/md5-cache/virtual/perl-Time-Piece-1.290.0-r1
index fe6d2aa7613c..d7a54e70d75e 100644
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.290.0-r1
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.290.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Piece
 EAPI=5
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.22* ~perl-core/Time-Piece-1.290.0 ) dev-lang/perl:= !<perl-core/Time-Piece-1.290.0 !>perl-core/Time-Piece-1.290.0-r999
 SLOT=0
-_md5_=32edf04bcb0cd74df495d70e90fd59f3
+_md5_=0a9c13df5b2fbd7267c471228e619131
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.200.100_rc b/metadata/md5-cache/virtual/perl-XSLoader-0.200.100_rc
index 36d9c0ffdd8b..0f353e42c8b7 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.200.100_rc
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.200.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=5
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.22.3* ~perl-core/XSLoader-0.200.100_rc ) dev-lang/perl:= !<perl-core/XSLoader-0.200.100_rc !>perl-core/XSLoader-0.200.100_rc-r999
 SLOT=0
-_md5_=62c4cf212573f07c03fc6cfbe16b777a
+_md5_=61462249514c8ee3c779789f5ea165cb
diff --git a/metadata/md5-cache/virtual/perl-bignum-0.390.100_rc b/metadata/md5-cache/virtual/perl-bignum-0.390.100_rc
index 1146a00693fe..9f9fd9f0e4c0 100644
--- a/metadata/md5-cache/virtual/perl-bignum-0.390.100_rc
+++ b/metadata/md5-cache/virtual/perl-bignum-0.390.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for bignum
 EAPI=5
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.22.3* ~perl-core/bignum-0.390.100_rc ) dev-lang/perl:= !<perl-core/bignum-0.390.100_rc !>perl-core/bignum-0.390.100_rc-r999
 SLOT=0
-_md5_=98a7b50f3c05552e0df6ad818961d376
+_md5_=309bf4460f52acd7fe253eb0e320ac52
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.50.100_rc b/metadata/md5-cache/virtual/perl-libnet-3.50.100_rc
index fc51ae51233c..d493feefd7db 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.50.100_rc
+++ b/metadata/md5-cache/virtual/perl-libnet-3.50.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=5
-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
+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.22.3* ~perl-core/libnet-3.50.100_rc ) dev-lang/perl:= !<perl-core/libnet-3.50.100_rc !>perl-core/libnet-3.50.100_rc-r999
 SLOT=0
-_md5_=639f92bae03a244a5496e20e8986779b
+_md5_=88ed44902c5adb5a7dd8334456198be5
diff --git a/metadata/md5-cache/virtual/perl-threads-2.10.0-r1 b/metadata/md5-cache/virtual/perl-threads-2.10.0-r1
index a937b1aa740f..484d21cbdffd 100644
--- a/metadata/md5-cache/virtual/perl-threads-2.10.0-r1
+++ b/metadata/md5-cache/virtual/perl-threads-2.10.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
 EAPI=5
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.22*[ithreads] ~perl-core/threads-2.10.0 ) dev-lang/perl:= !<perl-core/threads-2.10.0 !>perl-core/threads-2.10.0-r999
 SLOT=0
-_md5_=81be4a81ff0465bac6f7fbb21a73854d
+_md5_=6acafa5c8397011c4fcda037b952f8ca
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.480.0-r1 b/metadata/md5-cache/virtual/perl-threads-shared-1.480.0-r1
index c3f996d54fec..b7eff7465f1c 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.480.0-r1
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.480.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
 EAPI=5
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.22* ~perl-core/threads-shared-1.480.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.480.0 !>perl-core/threads-shared-1.480.0-r999
 SLOT=0
-_md5_=d09372385120687f38cac84c8942130e
+_md5_=7fbd7b0d9413c3a4361951fc0dee044d
diff --git a/metadata/md5-cache/virtual/ruby-ssl-7 b/metadata/md5-cache/virtual/ruby-ssl-7
deleted file mode 100644
index 82b6fe2b03bd..000000000000
--- a/metadata/md5-cache/virtual/ruby-ssl-7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
-EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-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
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9[ssl] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7968f32974ecc3df6972323a1b770937
diff --git a/metadata/md5-cache/virtual/ruby-ssl-8 b/metadata/md5-cache/virtual/ruby-ssl-8
index 19f5521c6fe7..f1de0ed12f51 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-8
+++ b/metadata/md5-cache/virtual/ruby-ssl-8
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=5
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-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
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=28aa1340d12cbde5f1b8722fddd57fc1
+_md5_=2155d2b7942371abb9c93522a57230e9
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.21 b/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.28
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.21
rename to metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.28
index eef55de74c30..b1aaaeff42ad 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.21
+++ b/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.28
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.21-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.28-1_amd64.deb
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ab43bf7c2a7cd81061e47f3d60bc13d
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-57.0.2946.0 b/metadata/md5-cache/www-client/google-chrome-unstable-57.0.2950.4
similarity index 96%
rename from metadata/md5-cache/www-client/google-chrome-unstable-57.0.2946.0
rename to metadata/md5-cache/www-client/google-chrome-unstable-57.0.2950.4
index b0dfc4eea416..b929d0a1df17 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-57.0.2946.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-57.0.2950.4
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_57.0.2946.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_57.0.2950.4-1_amd64.deb
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ab43bf7c2a7cd81061e47f3d60bc13d
diff --git a/metadata/md5-cache/www-client/links-2.14 b/metadata/md5-cache/www-client/links-2.14
index 01057a023cb6..e9b0dc3cc84e 100644
--- a/metadata/md5-cache/www-client/links-2.14
+++ b/metadata/md5-cache/www-client/links-2.14
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and lightweight web browser running in both graphics and text
 EAPI=6
 HOMEPAGE=http://links.twibright.com/
 IUSE=bzip2 directfb fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) directfb? ( media-libs/libpng:0= dev-libs/DirectFB ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.14.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.10-2.debian.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5a5be90aa45a1571cfb53dfc3ee02617
+_md5_=2e2cadfa5ad2dd2bd576e6492ce87b74
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.21_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.28_beta
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.21_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.28_beta
index 04e663b7b715..641de4f4c61d 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.21_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.28_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.21-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.28-1_amd64.deb
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=9849401908443c04a5389fb907aa5b26
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2946.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2950.4_alpha
similarity index 90%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2946.0_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2950.4_alpha
index 579d6318018d..9d5519c67eb0 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2946.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-57.0.2950.4_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_57.0.2946.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_57.0.2950.4-1_amd64.deb
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=9849401908443c04a5389fb907aa5b26
diff --git a/metadata/md5-cache/www-plugins/kpartsplugin-20120723-r2 b/metadata/md5-cache/www-plugins/kpartsplugin-20120723-r2
index e4cee70b6295..d453890d18f9 100644
--- a/metadata/md5-cache/www-plugins/kpartsplugin-20120723-r2
+++ b/metadata/md5-cache/www-plugins/kpartsplugin-20120723-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/kpartsplugin-20120723.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=01187f2c3c08d4a88498f6c4584019e9
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.0 b/metadata/md5-cache/www-servers/adsf-1.2.0
deleted file mode 100644
index 0d96d2db66b6..000000000000
--- a/metadata/md5-cache/www-servers/adsf-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Dead Simple Fileserver is a static file server that can launch in a directory
-EAPI=5
-HOMEPAGE=http://nanoc.stoneship.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/ddfreyne/adsf/archive/1.2.0.tar.gz -> adsf-1.2.0.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f41d033e6a0e46fdf8227c1b2b35ec5
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.1 b/metadata/md5-cache/www-servers/adsf-1.2.1
index f8c18474a275..b5ad302bedee 100644
--- a/metadata/md5-cache/www-servers/adsf-1.2.1
+++ b/metadata/md5-cache/www-servers/adsf-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Dead Simple Fileserver is a static file server that can launch in a directory
 EAPI=5
 HOMEPAGE=http://nanoc.stoneship.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.2.1.tar.gz -> adsf-1.2.1.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c10d75ea05a19ae31eaeaca0758414f7
+_md5_=aa33c3fd0a092f3d1bde890bf78640b4
diff --git a/metadata/md5-cache/www-servers/apache-2.2.31-r1 b/metadata/md5-cache/www-servers/apache-2.2.31-r1
index 41a4e6f98539..a3ab4f77e7e8 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.31-r1
+++ b/metadata/md5-cache/www-servers/apache-2.2.31-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.2.31
 RDEPEND=>=dev-libs/apr-1.4.5 dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.31.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.2.29-20140922.tar.bz2
 _eclasses_=apache-2	35b195143f6b5edeba0876f19b1c8107	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c5447f373740c56680b171dddcc8d6dc
+_md5_=a164ada57c9554096a5e22b2536271bf
diff --git a/metadata/md5-cache/www-servers/apache-2.4.23-r2 b/metadata/md5-cache/www-servers/apache-2.4.23-r2
index 96498c9c1046..08480bf43b52 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.23-r2
+++ b/metadata/md5-cache/www-servers/apache-2.4.23-r2
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.23
 RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.23.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2 http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?r1=1751970&r2=1751969&pathrev=1751970&view=patch -> apache-2.4.23-fcgi_fix.patch
 _eclasses_=apache-2	35b195143f6b5edeba0876f19b1c8107	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=66ad7f3a7e4c74d7f2b64064413492af
+_md5_=d843a6fd1bf222ac3ae9c838d18c6e0e
diff --git a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8 b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
index b60049acf1a9..b4919300af03 100644
--- a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
+++ b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compizconfig-backend-kconfig4-0.8.8.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fcc0a2b3a69c5b55b70210d40f99d461
diff --git a/metadata/md5-cache/x11-misc/lightdm-kde-0.3.2.1-r1 b/metadata/md5-cache/x11-misc/lightdm-kde-0.3.2.1-r1
index 2c904e80d83e..df82b26451cc 100644
--- a/metadata/md5-cache/x11-misc/lightdm-kde-0.3.2.1-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-kde-0.3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 dev-qt/qtdeclarative:4 >=x11-misc/lightdm-1.4.0[qt4] >=kde-apps/plasma-runtime-4.8:4[aqua=] kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_lt(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_mr(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.8:4[aqua=,l10n_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/lightdm-kde/src/lightdm-kde-0.3.2.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d401ca9caf00ceae33f9794d5a3cd223
diff --git a/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1 b/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1
index 49fe5d44ab50..df35ad962134 100644
--- a/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1
+++ b/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A terminal emulator designed to integrate with the ROX environment
 EAPI=5
 HOMEPAGE=http://roxterm.sourceforge.net/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90
 SLOT=0
 SRC_URI=mirror://sourceforge/roxterm/roxterm-2.9.3.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=154c18a57bc24cf48d79dffb74fb3dcd
+_md5_=0b5731c172dfc00a1cba62006b46fcd6
diff --git a/metadata/md5-cache/x11-themes/bespin-0_p20140225 b/metadata/md5-cache/x11-themes/bespin-0_p20140225
index bab0d065a7c9..6259b4e8e90a 100644
--- a/metadata/md5-cache/x11-themes/bespin-0_p20140225
+++ b/metadata/md5-cache/x11-themes/bespin-0_p20140225
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qt3support:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 x11-libs/libX11 x11-libs/libXrender kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=] )
 SLOT=4
 SRC_URI=https://sourceforge.net/code-snapshots/svn/c/cl/cloudcity/code/cloudcity-code-1712.zip
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=02b6314c801d21eb866b4cdb9365fa20
diff --git a/metadata/md5-cache/x11-themes/crystal-2.2.1 b/metadata/md5-cache/x11-themes/crystal-2.2.1
index e02f8017baa5..abf7dd8b0ecd 100644
--- a/metadata/md5-cache/x11-themes/crystal-2.2.1
+++ b/metadata/md5-cache/x11-themes/crystal-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kwin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/75140-crystal-2.2.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2d0801c50c5f51c39b302215175c9781
diff --git a/metadata/md5-cache/x11-themes/dekorator-0.5.1-r1 b/metadata/md5-cache/x11-themes/dekorator-0.5.1-r1
index dceee3fc2c45..5874eb9761ed 100644
--- a/metadata/md5-cache/x11-themes/dekorator-0.5.1-r1
+++ b/metadata/md5-cache/x11-themes/dekorator-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/kwin:4 media-libs/qimageblitz kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/87921-dekorator-0.5.1.tar.bz2
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d99dcf5aa5adc5c114cf052551fc7438
diff --git a/metadata/md5-cache/x11-themes/nitrogen-3.3.3 b/metadata/md5-cache/x11-themes/nitrogen-3.3.3
index 5a80a59bbafc..e2ec03736208 100644
--- a/metadata/md5-cache/x11-themes/nitrogen-3.3.3
+++ b/metadata/md5-cache/x11-themes/nitrogen-3.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_de(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,l10n_pl(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/99551-kde4-windeco-nitrogen-3.3.3-Source.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e803bbc23ec1528387da771725c2b33
diff --git a/metadata/md5-cache/x11-themes/skulpture-0.2.4-r1 b/metadata/md5-cache/x11-themes/skulpture-0.2.4-r1
index ba8dc677bb13..f442c5d7be85 100644
--- a/metadata/md5-cache/x11-themes/skulpture-0.2.4-r1
+++ b/metadata/md5-cache/x11-themes/skulpture-0.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-plasma/kwin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://kde-look.org/CONTENT/content-files/59031-skulpture-0.2.4.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4c16f2874f14298284e2acebc5b3e708
diff --git a/metadata/md5-cache/x11-themes/smaragd-0.0.7 b/metadata/md5-cache/x11-themes/smaragd-0.0.7
index 9d0f064f8179..bd8e3939cc0f 100644
--- a/metadata/md5-cache/x11-themes/smaragd-0.0.7
+++ b/metadata/md5-cache/x11-themes/smaragd-0.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-plasma/libkworkspace:4 x11-libs/cairo kde-plasma/kwin:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/125162-smaragd-0.0.7.tar.gz
-_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	16e40479aefbbed67ea20779992ab90e	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	32c8c8590b5843c0b31b7de1b1f6dbd3	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0b62a2004fde3578da7b8723a38fa12e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 30bd36995e74..ec65804eea2b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Dec 2016 20:43:15 +0000
+Sat, 17 Dec 2016 19:43:24 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ebcb37e80c3a..cf3db1bc05ee 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 16 20:39:25 UTC 2016
+Sat Dec 17 19:39:35 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index de3f3d4d7eaa..3474796e7534 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Dec 2016 22:00:01 +0000
+Sat, 17 Dec 2016 20:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7b55f4f0f9a1..d80048335546 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1481920801 Fri 16 Dec 2016 08:40:01 PM UTC
+1482003602 Sat 17 Dec 2016 07:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 30bd36995e74..ec65804eea2b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 16 Dec 2016 20:43:15 +0000
+Sat, 17 Dec 2016 19:43:24 +0000
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index ed2b132b1f65..812521ff0a8a 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1 +1,2 @@
 DIST bmon-3.9.tar.gz 61176 SHA256 02120aafb1959285562074490c0a9f7f8648161f9db534cf5792fc16d6e0326c SHA512 4ae7bc557d0c59694f6fbf0a7e91969bd83c3b48fe507be95bfe88b3211d57231de24ebd6358d1c0feca490f4d1ea10fade16baf1d1d683c82e76343a730c705 WHIRLPOOL 2f266f7b47a24fe6929f94cb3547ad9e3033ff60bcc0200a0d8d6b82b00bf7870786aaa674191c4fd8a98efbc7b3b90c35065fa7ed3b4eb503fee0030cb57099
+DIST bmon-4.0.tar.gz 61843 SHA256 d5e503ff6b116c681ebf4d10e238604dde836dceb9c0008eb92416a96c87ca40 SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d WHIRLPOOL ba1a562da80b3d950807941c2a97a20750a6d1b2d15eaa6d585fbc1eb5dc82bfcbf4ceabe5fddba0d72a76542c0aed26420b28b478cca9e8c28e67b380c9f0fb
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
new file mode 100644
index 000000000000..bb00e7920a29
--- /dev/null
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils linux-info toolchain-funcs
+
+DESCRIPTION="interface bandwidth monitor"
+HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/"
+SRC_URI="
+	https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.3-r2:=
+	dev-libs/confuse:=
+	dev-libs/libnl:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+CONFIG_CHECK="~NET_SCHED"
+ERROR_NET_SCHED="
+	CONFIG_NET_SCHED is not set when it should be.
+	Run ${PN} -i proc to use the deprecated proc interface instead.
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-3.6-docdir-examples.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		--docdir="/usr/share/doc/${PF}"
+}
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index 25937a3776d6..dd97b9164962 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug fftw libressl l10n_nl ncurses ssl tfo"
 
 RDEPEND="
diff --git a/net-dialup/ppp/ppp-2.4.7-r3.ebuild b/net-dialup/ppp/ppp-2.4.7-r3.ebuild
index ae9c2c9deb36..cedbbde0b025 100644
--- a/net-dialup/ppp/ppp-2.4.7-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="activefilter? ( net-libs/libpcap )
diff --git a/net-dns/unbound/unbound-1.5.10.ebuild b/net-dns/unbound/unbound-1.5.10.ebuild
index 040c219a3e55..9d02d2e86964 100644
--- a/net-dns/unbound/unbound-1.5.10.ebuild
+++ b/net-dns/unbound/unbound-1.5.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="debug dnstap +ecdsa gost libressl python selinux static-libs test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 10d848f0eb4d..f04c94a11d88 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -1,2 +1 @@
-DIST rbot-0.9.15_p20131020.tar.gz 773953 SHA256 74b4db6a2b24784a1779518cd070bbf8cb6d4a5059167579d8226a0fc69cef15 SHA512 3319031361f7ab23e43a997a94663790775047c50eb8eb51f3f579cf879ca822b48118060fdd9f2816d5d97c57de8f6fb7ce883457336f961ff25cf6c49a8d2a WHIRLPOOL 8e77fdeb290dae0c4932628e010768217df223e94a5ec902ed48e9db3a2c2985ef2df932e84048ab8721b8d4bb954852397974afa02f1bdfc1e1b8533b58d812
 DIST rbot-0.9.15_p20160325.tar.gz 762685 SHA256 ae638f53607ad0f1d365ff3c4408ef3c27c8e0f5e83ae355742185c1076ec96e SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160 WHIRLPOOL e2fbeb41c065ea8642bff49ffade38992c6ab7ccee107d1e140c1810daed869e6e378ac59f7453eeacf8f24e3a980dcb5b911f706475c6f2457a61e3b0483902
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
index 7568c0f5cdb1..f51f366a4844 100644
--- a/net-irc/rbot/metadata.xml
+++ b/net-irc/rbot/metadata.xml
@@ -30,11 +30,6 @@
     Build and install translation for the messages coming from the bot
     and its plugins (through <pkg>dev-ruby/ruby-gettext</pkg>).
   </flag>
-  <flag name="dict">
-    Add dependency over <pkg>dev-ruby/ruby-dict</pkg>, which is needed
-    to enable the "dict" plugin for rbot. If the USE flag is disabled
-    the plugin is also disabled by default.
-  </flag>
   <flag name="figlet">
     Add dependency over <pkg>app-misc/figlet</pkg>, which is used by
     the "figlet" plugin for rbot. If the USE flag is disabled the
diff --git a/net-irc/rbot/rbot-0.9.15_p20131020-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20131020-r1.ebuild
deleted file mode 100644
index 581cccb3fe1e..000000000000
--- a/net-irc/rbot/rbot-0.9.15_p20131020-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-inherit ruby-ng eutils user
-
-DESCRIPTION="A ruby IRC bot"
-HOMEPAGE="http://ruby-rbot.org/"
-SRC_URI="http://dev.a3li.li/gentoo/distfiles/${P}.tar.gz"
-
-LICENSE="|| ( feh GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="spell aspell timezone translator shorturl nls dict figlet
-	fortune cal host toilet"
-ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
-RUBY_S="${PN}-master"
-
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND+="
-	spell? (
-		aspell? ( app-text/aspell )
-		!aspell? ( app-text/hunspell )
-	)
-	figlet? ( app-misc/figlet )
-	toilet? ( app-misc/toilet )
-	fortune? ( games-misc/fortune-mod )
-	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
-	host? ( net-dns/bind-tools )"
-
-ruby_add_bdepend "
-	nls? (
-		>=dev-ruby/ruby-gettext-2
-		dev-ruby/rake
-	)"
-
-ruby_add_rdepend "
-	dev-ruby/tokyocabinet
-	timezone? ( dev-ruby/tzinfo )
-	translator? ( dev-ruby/mechanize )
-	shorturl? ( dev-ruby/shorturl )
-	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
-	dict? ( >=dev-ruby/ruby-dict-0.9.4-r2 )"
-
-RUBY_PATCHES=( "rbot-rakefile.patch" )
-
-pkg_setup() {
-	enewuser rbot -1 -1 /var/lib/rbot nobody
-}
-
-all_ruby_compile() {
-	disable_rbot_plugin() {
-		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
-	}
-	use_rbot_plugin() {
-		use $1 && return
-		disable_rbot_plugin "$2"
-	}
-	rbot_conf() {
-		echo "$1: $2" >> "${T}"/rbot.conf
-	}
-	use_rbot_conf_path() {
-		use "$1" \
-			&& rbot_conf "$2" "$3" \
-			|| rbot_conf "$2" /bin/false
-	}
-
-	local spell_program="/usr/bin/hunspell -i"
-	if use !spell; then
-		disable_rbot_plugin spell
-		spell_program="/bin/false"
-	elif use aspell; then
-		spell_program="/usr/bin/ispell-aspell"
-	fi
-
-	rbot_conf spell.program "${spell_program}"
-
-	if use !figlet && use !toilet; then
-		disable_rbot_plugin figlet
-	fi
-
-	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
-	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
-
-	use_rbot_plugin timezone time
-	use_rbot_plugin translator translator
-	use_rbot_plugin shorturl shortenurls
-	use_rbot_plugin dict dictclient
-
-	use_rbot_plugin fortune fortune
-	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
-
-	use_rbot_plugin cal cal
-	use_rbot_conf_path cal cal.path /usr/bin/cal
-
-	use_rbot_plugin host host
-	use_rbot_conf_path host host.path /usr/bin/host
-
-	local rbot_datadir="${D}"/usr/share/rbot
-
-	# This is unfortunately pretty manual at the moment, but it's just
-	# to avoid having to run special scripts to package new versions
-	# of rbot. The default if new languages are added that are not
-	# considered for an opt-out here is to install them, so you just
-	# need to add them later.
-	if use nls; then
-		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS} ]]; then
-			# As the the language name used by the rbot data files does
-			# not correspond to the ISO codes we usually use for LINGUAS,
-			# the following list of local varables will work as a
-			# dictionary to get the name used by rbot from the ISO code.
-			local lang_rbot_zh_CN="traditional_chinese"
-			local lang_rbot_ru="russian"
-			local lang_rbot_nl="dutch"
-			local lang_rbot_de="german"
-			local lang_rbot_fi="finnish"
-			local lang_rbot_fr="french"
-			local lang_rbot_it="italian"
-			local lang_rbot_ja="japanese"
-
-			for lang in ${ILINGUAS}; do
-				use linguas_${lang} && continue
-
-				lang_varname="lang_rbot_${lang}"
-				lang_rbot=${!lang_varname}
-
-				rm -r \
-					"${S}"/data/rbot/languages/${lang_rbot}.lang \
-					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
-					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
-					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
-					"${S}"/po/${lang} &>/dev/null
-			done
-		fi
-
-		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb config --prefix="/usr" \
-		|| die "setup.rb install failed"
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb install --prefix="${D}" \
-		|| die "setup.rb install failed"
-}
-
-all_ruby_install() {
-	diropts -o rbot -g nobody -m 0700
-	keepdir /var/lib/rbot
-
-	insinto /etc
-	doins "${T}"/rbot.conf
-
-	newinitd "${FILESDIR}/rbot.init2" rbot
-	newconfd "${FILESDIR}/rbot.conf2" rbot
-}
-
-pkg_postinst() {
-	elog "rbot can be started as a normal service."
-	elog "Check /etc/conf.d/rbot file for more information about this feature."
-	ewarn "DEPRECATION NOTICE:"
-	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
-	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
-	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
-	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.27.ebuild b/net-mail/dovecot/dovecot-2.2.27.ebuild
index c76a581fc38f..ed54c7fb3220 100644
--- a/net-mail/dovecot/dovecot-2.2.27.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.27.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ppc ~ppc64 ~s390 x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
index 238cc680d66b..dffa5083b562 100644
--- a/net-misc/buka/Manifest
+++ b/net-misc/buka/Manifest
@@ -1 +1 @@
-DIST buka-1.0.tar.gz 13443 SHA256 175f6bad7d5087c0555d51984ccd301c0f903d9e68f2ed5f9a0a3700a29f9d53 SHA512 115eaebb23efe205a61ac87e803a5375be6daf1e4c7e685e2bcb1e105caf5100cac48af96fd570b1815b7b7f655c2954d93afe2661d759e88d64faf7e8d01b2b WHIRLPOOL bc8af288344957baacebcfd0b33dc871b3eef80e3f98d016315be41a7a4dc50183aeba9afdf896a3ce3ed09a6d77a52663ff9d75499a8d0f5469410051829e3f
+DIST buka-2.0.tar.gz 14088 SHA256 b7d33f15687198a78b7114251038e54ef70f3ef1a74dd84a36176874ca699793 SHA512 809c35fa0caed30c11f438fc5d68a446a2c8a6ffa6b233f5e65bb522d8de8db095ad3ef8c0811a3670a49e3994d4956f917d3d2dfda3ff488ca8793d7389e4a6 WHIRLPOOL 761a9614b41cecc821bc1279d863b620512fd7788a1ec3cbd8ad3d75e89a47ffd8e485b45b323964970ae90c5852becc10fdb61672b19e4d26bae76b67ff0135
diff --git a/net-misc/buka/buka-1.0.ebuild b/net-misc/buka/buka-2.0.ebuild
similarity index 77%
rename from net-misc/buka/buka-1.0.ebuild
rename to net-misc/buka/buka-2.0.ebuild
index d7e0d0971ccd..57f56109c621 100644
--- a/net-misc/buka/buka-1.0.ebuild
+++ b/net-misc/buka/buka-2.0.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=6
 
+inherit eutils
+
 DESCRIPTION="Download manga from buka.cn"
 HOMEPAGE="https://gitgud.io/drylemon/buka"
 SRC_URI="http://lick.moe/buka/${P}.tar.gz"
@@ -22,3 +24,9 @@ src_install()
 	doman ${PN}.1
 	dobin ${PN}
 }
+
+pkg_postinst()
+{
+	optfeature "pdf support" media-gfx/imagemagick
+	optfeature "cbz support" app-arch/zip
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 46c7577a1938..93b717b9ca6d 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,3 +3,4 @@ DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe95565
 DIST chrony-2.4.1.tar.gz 390641 SHA256 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d WHIRLPOOL ed2c2ac8e11371e009d3e96553bb73e58b410bb38e6123a9e39a3451e5dc6860d981d45e67b4e2dc47b39f616f95146feb35efd15dbaa90932f07837172c440a
 DIST chrony-2.4.tar.gz 390077 SHA256 8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f SHA512 29bbeba05fb9897d438cddca7dd4e573a1e9da0d583bd737185088e8b777fdfba4056d091d2bbab78824de284b6244a8de7ada8f62be316e815a3d8ae6145485 WHIRLPOOL 7ad8b17ee8c29afa6734b7f096bb56bc08cfb200747141f0fa77e6a37daab118e1c571b8869abcab7e4893ae3eaae6a6d783425058bbaf8508cbd8de215cb49d
 DIST chrony-3.0-pre1.tar.gz 416442 SHA256 5e5852c4e47026b481eebc2218fe825c0c599aefe4c7aa1e3439e66d722c212c SHA512 c12328befd6360e051ca02f00e972fe30286417f177887bf922cfb276b80873d341fd6e4e044930444a42a75e69f0d6ac0c30c1dda9735919118287884455909 WHIRLPOOL bb983360bffcf1841210ccfbfbfeb375751d332f4bbbca9de4a2b203a1067fa5e88db68d2d4bace7766cb1fd5d687a5e92469d48d4124fd62a8e9501cdd9af94
+DIST chrony-3.0-pre2.tar.gz 418066 SHA256 de91ec4deed5e7c40954c3ef6f59987f3384f30f224f1cb121a67b3874e5f830 SHA512 ffa729c7574c3ae5efea5eba70336e0c7cab8ff7fbef8588f016be91cfcf4413fec2515c874d672ebc6ed191fa15ae7c2f4ecef3a96e426b21f50cd782abbdeb WHIRLPOOL 1dca26084f967a0b0332156671ed2ca21219f775a4e497aec9801c89836e4bafc01efb0ad33667526ba9360ebd2d0222f1f293389f9de427bc1978f7c72301a4
diff --git a/net-misc/chrony/chrony-3.0_pre2.ebuild b/net-misc/chrony/chrony-3.0_pre2.ebuild
new file mode 100644
index 000000000000..11751446effb
--- /dev/null
+++ b/net-misc/chrony/chrony-3.0_pre2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~hppa ~ppc64"
+IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+	?? ( libedit readline )
+"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c doc/*.man.in examples/* || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex cmdmon '' --disable-cmdmon) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex ntp '' --disable-ntp) \
+		$(usex phc '' --disable-phc) \
+		$(usex pps '' --disable-pps) \
+		$(usex rtc '' --disable-rtc) \
+		$(usex refclock '' --disable-refclock) \
+		$(usex adns '' --disable-asyncdns) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--chronysockdir=/run/chrony \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--disable-sechash \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/iperf/iperf-2.0.9.ebuild b/net-misc/iperf/iperf-2.0.9.ebuild
index ad00c40aa1fa..06dd6983dd72 100644
--- a/net-misc/iperf/iperf-2.0.9.ebuild
+++ b/net-misc/iperf/iperf-2.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS="~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="ipv6 threads debug"
 
 DOCS="INSTALL README"
diff --git a/net-misc/iperf/iperf-3.1.3.ebuild b/net-misc/iperf/iperf-3.1.3.ebuild
index 68cba268561f..276ab197b3ca 100644
--- a/net-misc/iperf/iperf-3.1.3.ebuild
+++ b/net-misc/iperf/iperf-3.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="sctp static-libs"
 
 DEPEND="sctp? ( net-misc/lksctp-tools )"
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index af321bcf0fef..6b1e77bcbb57 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,4 +1,5 @@
 DIST mock_msg.h 1356 SHA256 d6c56a423753c0b938a5dc32c978984eebb97243a2671a1652440093f67d61fb SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea WHIRLPOOL 4cce848abc141e9d39cca1f8a0c9d11c0819d8a6e640c541968df491d2a6c3c0746233742418ee43c8bbc6ef19028a41159efae2922bcc719bd86442da05df86
 DIST openvpn-2.3.12.tar.gz 1235262 SHA256 f5d39b8c55f75b0aab943059b20571452b494146d997b12d48ce9bd753c01cff SHA512 8de40e9177268cce64906915ddc0d23381b4040ed00e6eefe4784b04d48f50d5c5ce9e99886eb18fe45d22c5c047478b9aa942e4c4eeaf115cc443a1d3ebe631 WHIRLPOOL 4adeb0da83a4fbff27bc90a3941b593f97dfdc3f50c3ccf10c113293bb0e4f85ead680b53645a2a078f907026549c8dbf068dcc64c9f89b6a967b3eb919f2c8c
 DIST openvpn-2.3.13.tar.gz 1237826 SHA256 0e017211bf2a0607b1dda5e8e3f710b4c54aa5a63e1f89a8b17054abee20fa86 SHA512 72e979f2e3e10d2aec6cb8a8bda97bc15bbf3a4e392ae13a5ebc7d0553c174801d2d93ccd2087e16ac0cbd6527a93dd66a4823be658d5730a9391c7a8bce2294 WHIRLPOOL f896e91341eee512a941efb58b2fa42b88181870f17d54ae08ad8fb848ab09e922e9678d0d6325fd57b54c5dd9848fda0cc820ec692dcbe58db96e14186b7641
-DIST openvpn-2.4_rc1.tar.gz 1360801 SHA256 97ba64983531f5e27771a338518f9084a218442f5463ad055f4ceae9f523eb91 SHA512 ae531ac7e6bb6fd3323a0a7f3cef57b94a3f120fd33385c6d4528f6b831fd6f0c567616d0e048dd45fbe20829bd1432483798d82382eaa99fe0f14f93448c0b0 WHIRLPOOL 4f8d4df0c614705f9d9f3030d28be88705ab3dafaf0a86b4fb27727b84409e3235f6c0cf44bc5985e7316a3307f20e1197df3208551a2b06db18d733251ec2b5
+DIST openvpn-2.3.14.tar.gz 1241145 SHA256 2b55b93424e489ab8b78d0ed75e8f992ab34052cd666bc4d6a41441919143b97 SHA512 0ec9483be5b1b7ea6c670c724369c5bed799a9f81375c0c4b3f34fa1ebcd4bff60e37668bbbcab6f1d6d66a807da719e44ee11c2c12f2eb7a3277936549f7bd1 WHIRLPOOL f5d1bc8dc316b3ee4c8b1d183f42fd9b4f02606e7d2c4b7afe42330e892b664ee1b4f516ba653cf6b6a197a8e7f1be8f2a29f9c39a0a450e071b855f2f1dbc3a
+DIST openvpn-2.4_rc2.tar.gz 1403262 SHA256 eb97153fe2f0b28be71904cabcaf9c7f9ec1c55871ba38d62066c8811274caf9 SHA512 351e42cbb6750e866fbac407f3f7b308cde5631d07d84fa4d4851d9828a334548de639add385a0fb3387d8e1ae3d2601d4d8a2eadc27b474c72dab04039f52fa WHIRLPOOL f366272ab6d7fc0989dff229d8c41945f58562d3398733d49609b57be0905addda08b553e05672493eac9e1e1f60599b6554b4b09d6c49f7b33db3a1f3b1758f
diff --git a/net-misc/openvpn/openvpn-2.3.14.ebuild b/net-misc/openvpn/openvpn-2.3.14.ebuild
new file mode 100644
index 000000000000..673ce7b5ca36
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.14.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib flag-o-matic user systemd linux-info
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl !libressl )
+			pkcs11? ( ssl )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	ssl? (
+		!polarssl? (
+			!libressl? ( >=dev-libs/openssl-0.9.7:* )
+			libressl? ( dev-libs/libressl )
+		)
+		polarssl? ( >=net-libs/polarssl-1.3.8 )
+	)
+	lzo? ( >=dev-libs/lzo-1.07 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+CONFIG_CHECK="~TUN"
+
+pkg_setup()  {
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	local myconf
+	use polarssl && myconf="--with-crypto-library=polarssl"
+	econf \
+		${myconf} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable socks) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+	find "${ED}/usr" -name '*.la' -delete
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample contrib
+	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
+	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	elog "The openvpn init script expects to find the configuration file"
+	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	elog ""
+	elog "To create more VPNs, simply create a new .conf file for it and"
+	elog "then create a symlink to the openvpn init script from a link called"
+	elog "openvpn.newconfname - like so"
+	elog "   cd /etc/openvpn"
+	elog "   ${EDITOR##*/} foo.conf"
+	elog "   cd /etc/init.d"
+	elog "   ln -s openvpn openvpn.foo"
+	elog ""
+	elog "You can then treat openvpn.foo as any other service, so you can"
+	elog "stop one vpn and start another if you need to."
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+
+	einfo ""
+	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}
diff --git a/net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild b/net-misc/openvpn/openvpn-2.4_rc2.ebuild
similarity index 96%
rename from net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild
rename to net-misc/openvpn/openvpn-2.4_rc2.ebuild
index 2b6db91b8408..431f14233bde 100644
--- a/net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.4_rc2.ebuild
@@ -23,10 +23,8 @@ REQUIRED_USE="static? ( !plugins !pkcs11 )
 	pkcs11? ( ssl )
 	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
-	!plugins? ( !pam !down-root )"
-
-# bug #601524
-REQUIRED_USE+=" inotify? ( plugins )"
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )"
 
 CDEPEND="
 	kernel_linux? (
@@ -54,8 +52,6 @@ CONFIG_CHECK="~TUN"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-external-cmocka.patch"
-	"${FILESDIR}/${P}-arm-inotify-only-in-server-mode.patch"
-	"${FILESDIR}/${P}-fix-async-push.patch"
 )
 
 pkg_setup()  {
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index 8e2e85fc66be..dcbc1b5794c9 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -23,10 +23,8 @@ REQUIRED_USE="static? ( !plugins !pkcs11 )
 	pkcs11? ( ssl )
 	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
-	!plugins? ( !pam !down-root )"
-
-# bug #601524
-REQUIRED_USE+=" inotify? ( plugins )"
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )"
 
 CDEPEND="
 	kernel_linux? (
diff --git a/net-misc/stunnel/stunnel-5.36.ebuild b/net-misc/stunnel/stunnel-5.36.ebuild
index c4ec0740cab6..d36b433a9c20 100644
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ b/net-misc/stunnel/stunnel-5.36.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/vinagre/vinagre-3.20.2-r1.ebuild b/net-misc/vinagre/vinagre-3.20.2-r1.ebuild
index dc5a5c1cfff0..5cd6ec1fcf6c 100644
--- a/net-misc/vinagre/vinagre-3.20.2-r1.ebuild
+++ b/net-misc/vinagre/vinagre-3.20.2-r1.ebuild
@@ -36,13 +36,14 @@ RDEPEND="
 	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 "
 DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
 	>=dev-lang/perl-5
 	dev-libs/appstream-glib
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	$(vala_depend)
 
 	gnome-base/gnome-common
 "
diff --git a/net-misc/whois/whois-5.2.12.ebuild b/net-misc/whois/whois-5.2.12.ebuild
index d780014fac41..22b1e8ce9b70 100644
--- a/net-misc/whois/whois-5.2.12.ebuild
+++ b/net-misc/whois/whois-5.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5b358865e491..48dbba311ff2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
 DIST youtube-dl-2016.09.19.tar.gz 2395739 SHA256 276637e83525778a83d0457f6b9fbc29d6109bc8366d43125432ce835d28545e SHA512 a8fb1ce054e25180eab3969c898d976dec157901931b66cddde0fecd55ef322e64c13a70d50de945849cbc4ccbf8be0aede845cbb8ea390bba34f51fec0533bf WHIRLPOOL e58d38e49d58b86d8eb25b40427046955e011bf57b0862c433ebe459c0268905bff67188c03bb612593d15b3d1f3408a95b510ad6f863d0144ee4307ed012aba
-DIST youtube-dl-2016.12.01.tar.gz 2478435 SHA256 ddff281a251c7a40bf8c28afa1df63e9a64ff61b6b8097535fbbe587e8ccaef7 SHA512 3e2cef363d2186bcb3e818848cae4a0d6455748f6c4b7f35e56e41a65c00e4d49726d53d06d59b9decb91eb60950087143e380c860cd605b72278cef830f2229 WHIRLPOOL a28315ba64f4417b4b77a5558a6ce55347e3d6a4afe3674ff176953f1527d41dc3e1cc03dc6854f4f0294acff809fb8382de91d735517d8bfbea029683f5ea97
 DIST youtube-dl-2016.12.12.tar.gz 2478147 SHA256 643efa7755ac4aa03a241f106d8923dfd5dbaf8d3c14e56b696048c4f2fab430 SHA512 c9dd2390c990761873aa5109510ed1352234097cda75ae153985f37bf092af9a45e161204160b6df5e051b1d4e223a671c803a76978e85d387075e3a278281c3 WHIRLPOOL 0aa6c0919d035346334d57bbd9cdd4e149b8cf3bef895bc58d338f4351ad3d889305765790ceed1fee760e73a2dedaaf3832ec4e996810cd0474ca262bf7ad01
+DIST youtube-dl-2016.12.15.tar.gz 2480252 SHA256 85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e SHA512 1e0b3f561142fffef9b0b530abeff5db0eed851b6b38275f8d8e78e673be03d9b563813ed7c40652ea3c44201fc0b0044455e2a6548e11e325868cb42d3faf29 WHIRLPOOL 7ef0d8377b732079bd53a0ed07ed9de9f42f9b7c42c64d44a398738cef97c91471bb5fecc9b3b13ee960938db83e999c949a76ae2c815ca6a8202fb964270783
diff --git a/net-misc/youtube-dl/youtube-dl-2016.12.01.ebuild b/net-misc/youtube-dl/youtube-dl-2016.12.15.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2016.12.01.ebuild
rename to net-misc/youtube-dl/youtube-dl-2016.12.15.ebuild
diff --git a/profiles/package.mask b/profiles/package.mask
index 3d8073ec9f10..7fceb2ced27c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -321,11 +321,6 @@ x11-themes/crystal
 # compression'.
 >=dev-util/xdelta-3.1.0
 
-# Johannes Huber <johu@gentoo.org> (16 Nov 2016)
-# Masked for removal in 30 days. Declared as dead by upstream.
-# Last release with 16.08.3. Exported to kde-sunset overlay.
-kde-apps/kuser
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Nov 2016)
 # Mask until drivers are fixed or adjusted to depend on older versions #599976
 =x11-base/xorg-drivers-1.19*
@@ -336,12 +331,6 @@ kde-apps/kuser
 # it is removed. Removal in 14 days.
 dev-qt/qtopenvg
 
-# Michael Palimaka <kensington@gentoo.org> (12 Nov 2016)
-# Depends on masked app-crypt/gpgme[cxx]
-=app-office/kmymoney-4.8*
-=kde-frameworks/kwallet-5.29.0-r1
-=kde-apps/kwalletd-16.04.3-r1
-
 # Gilles Dartiguelongue <eva@gentoo.org> (12 Nov 2016)
 # Keep shotwell development series masked.
 >=media-gfx/shotwell-0.25
@@ -396,60 +385,6 @@ sci-geosciences/googleearth
 # Mask Exim RCs
 =mail-mta/exim-4.88_rc6
 
-# Michael Palimaka <kensington@gentoo.org> (15 Sep 2016)
-# KDE PIM 5 masked for wider testing.
-=kde-apps/akonadi-16.08*
-=kde-apps/akonadi-calendar-16.08*
-=kde-apps/akonadi-contacts-16.08*
-=kde-apps/akonadi-import-wizard-16.08*
-=kde-apps/akonadi-mime-16.08*
-=kde-apps/akonadi-notes-16.08*
-=kde-apps/akonadi-search-16.08*
-=kde-apps/akonadiconsole-16.08*
-=kde-apps/akregator-16.08*
-=kde-apps/blogilo-16.08*
-=kde-apps/calendarjanitor-16.08*
-=kde-apps/calendarsupport-16.08*
-=kde-apps/eventviews-16.08*
-=kde-apps/grantlee-editor-16.08*
-=kde-apps/grantleetheme-16.08*
-=kde-apps/incidenceeditor-16.08*
-=kde-apps/kaddressbook-16.08*
-=kde-apps/kalarm-16.08*
-=kde-apps/kalarmcal-16.08*
-=kde-apps/kblog-16.08*
-=kde-apps/kcalutils-16.08*
-=kde-apps/kdepim-addons-16.08*
-=kde-apps/kdepim-apps-libs-16.08*
-=kde-apps/kdepim-meta-16.08*
-=kde-apps/kdepim-runtime-16.08*
-=kde-apps/kidentitymanagement-16.08*
-=kde-apps/kimap-16.08*
-=kde-apps/kldap-16.08*
-=kde-apps/kmail-16.08*
-=kde-apps/kmail-account-wizard-16.08*
-=kde-apps/kmailtransport-16.08*
-=kde-apps/kmbox-16.08*
-=kde-apps/knotes-16.08*
-=kde-apps/konsolekalendar-16.08*
-=kde-apps/kontact-16.08*
-=kde-apps/kontactinterface-16.08*
-=kde-apps/korganizer-16.08*
-=kde-apps/ktnef-16.08*
-=kde-apps/libgravatar-16.08*
-=kde-apps/libkdepim-16.08*
-=kde-apps/libksieve-16.08*
-=kde-apps/libktnef-16.08*
-=kde-apps/mailcommon-16.08*
-=kde-apps/mailimporter-16.08*
-=kde-apps/mbox-importer-16.08*
-=kde-apps/messagelib-16.08*
-=kde-apps/pim-data-exporter-16.08*
-=kde-apps/pim-sieve-editor-16.08*
-=kde-apps/pim-storage-service-manager-16.08*
-=kde-apps/pimcommon-16.08*
-=kde-apps/syndication-16.08*
-
 # Denis Dupeyron <calchan@gentoo.org> (12 Sep 2016)
 # Masked for testing, see bug #588894.
 =x11-misc/light-locker-1.7.0-r1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3893cda4a25d..9ebaa0cb7008 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1093,9 +1093,12 @@ app-text/groonga:zeromq - Enable net-libs/zeromq used for suggestion
 app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
 app-text/jmupdf:system-mupdf - Link against system version of app-text/mupdf
 app-text/lcdf-typetools:kpathsea - Enable integration with kpathsea search library (TeX related)
+app-text/libebook:tools - Build file conversion tools
+app-text/libmwaw:tools - Build file conversion tools
 app-text/libstaroffice:tools - Build conversion tools
 app-text/libstaroffice:zlib - Enable support for compressed data
-app-text/libwpd:tools - Build miscellaneous tools
+app-text/libwpd:tools - Build file conversion tools
+app-text/libwps:tools - Build file conversion tools
 app-text/mathtex:png - Generate png images by default instead of gif
 app-text/mupdf:openssl - Use dev-libs/openssl crypto backend
 app-text/pandoc:embed_data_files - Embed data files in binary for relocatable executable.
@@ -1971,7 +1974,7 @@ dev-libs/libnl:doc - Install development documentation
 dev-libs/libnl:python - Install experimental dev-lang/python bindings
 dev-libs/libnl:utils - Install command line interface utils
 dev-libs/liborcus:spreadsheet-model - Enable the spreadsheet model implementation
-dev-libs/liborcus:tools - Build miscellaneous tools
+dev-libs/liborcus:tools - Build various low-level parsers
 dev-libs/libowfat:diet - Compile against dev-libs/dietlibc
 dev-libs/libp11:doc - Generate and install API documentation for the package.
 dev-libs/libpcre:bzip2 - Add support for pcregrep command to search within bzip2-compressed files (via app-arch/bzip2).
@@ -5662,7 +5665,6 @@ net-irc/quassel:snorenotify - Support for Snore notification framework.
 net-irc/quassel:urlpreview - Use QtWebEngine rendering engine for showing URL thumbnails.
 net-irc/rbot:aspell - Use aspell instead of ispell in the "spell" plugin for rbot. The vanilla plugin uses ispell, but enabling this flag makes it use the ispell interface from aspell instead.
 net-irc/rbot:cal - Add dependency over a package providing the /usr/bin/cal command, which is needed to enable the "cal" plugin for rbot. If the USE flag is disabled the plugin is also disabled by default.
-net-irc/rbot:dict - Add dependency over dev-ruby/ruby-dict, which is needed to enable the "dict" plugin for rbot. If the USE flag is disabled the plugin is also disabled by default.
 net-irc/rbot:figlet - Add dependency over app-misc/figlet, which is used by the "figlet" plugin for rbot. If the USE flag is disabled the plugin will be unable to use figlet; if toilet is also disabled, the plugin will be disabled.
 net-irc/rbot:fortune - Add dependency over games-misc/fortune-mod, which is needed to enable the "fortune" plugin for rbot. If the USE flag is disabled the plugin is also disabled by default.
 net-irc/rbot:host - Add dependency over net-dns/bind-tools (providing /usr/bin/host), which is needed to enable the "host" plugin for rbot. If the USE flag is disabled the plugin is also disabled by default.
@@ -7788,7 +7790,6 @@ sys-fs/zfs:test-suite - Install regression test suite
 sys-fs/zfs-kmod:rootfs - Install zfs-shutdown script to support exporting a pool containing rootfs
 sys-kernel/aufs-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/aufs-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
-sys-kernel/aufs-sources:kdbus - Apply the kdbus patch. This also requires the "experimental" use flag.
 sys-kernel/aufs-sources:module - Patch kernel to allow aufs being build as a module.
 sys-kernel/aufs-sources:vanilla - Use vanilla kernel sources without applying genpatches. WARNING: This flag will drop all support from the Gentoo Kernel Security team
 sys-kernel/bliss-initramfs:luks - Encryption support
diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5.ebuild
index 9884dff8df1e..0e8baafe7d96 100644
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+inherit eutils gnome2-utils cmake-utils python-single-r1
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
diff --git a/sci-libs/armadillo/armadillo-7.500.2.ebuild b/sci-libs/armadillo/armadillo-7.500.2-r1.ebuild
similarity index 99%
rename from sci-libs/armadillo/armadillo-7.500.2.ebuild
rename to sci-libs/armadillo/armadillo-7.500.2-r1.ebuild
index ad690326d355..ef04d4f905d2 100644
--- a/sci-libs/armadillo/armadillo-7.500.2.ebuild
+++ b/sci-libs/armadillo/armadillo-7.500.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"
 SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
-SLOT="0/6"
+SLOT="0/7"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"
diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild
index 9deac6327d0a..c2360c8f7bbf 100644
--- a/sys-apps/baselayout/baselayout-2.3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild
index b67803051dd7..27a522efa232 100644
--- a/sys-apps/busybox/busybox-1.25.1.ebuild
+++ b/sys-apps/busybox/busybox-1.25.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
index 045d4357f19b..11e8ccfb21cf 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/pv/pv-1.6.0-r1.ebuild b/sys-apps/pv/pv-1.6.0-r1.ebuild
index 4afd5f03fe22..e3e67561bcec 100644
--- a/sys-apps/pv/pv-1.6.0-r1.ebuild
+++ b/sys-apps/pv/pv-1.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
index 10b5796189de..c4bcf872b8a0 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos +pam sasl test +utils"
 
 COMMON_DEP="
diff --git a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
index 6e0d28ca8cda..84092fc3c590 100644
--- a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
+++ b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
index 8f0a2c6e1924..1c2551da41bf 100644
--- a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
+++ b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="hpe"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-block/storcli/storcli-1.19.04.ebuild b/sys-block/storcli/storcli-1.19.04.ebuild
index 744ee10c5f18..4e059c1a68ae 100644
--- a/sys-block/storcli/storcli-1.19.04.ebuild
+++ b/sys-block/storcli/storcli-1.19.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-co
 
 LICENSE="Avago LSI BSD"
 SLOT="0/6.11"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index d828227038bb..186a522c0688 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,2 +1 @@
-DIST heat-7.0.0.tar.gz 2269393 SHA256 16db746d540cee87170ec1fa6fdca945b6d2ead91b39e59f4d2d4a4c1d69e2db SHA512 23026d56e871bb8d86b0020678c4a0233ec63d4b16d338e089f4e594f1814d8581c5c46f3035993934711e34beccc18acb350e85e98675f52aba6e194f3de3fc WHIRLPOOL 08c87c89597c3f92ccc8cb96888f53b27ac44a46b245ab5b993c96b34446330df76dc098f26ab5dcd2d46970052315ead7b93ad3a44855a4f17f46d694a624d8
 DIST heat-7.0.1.tar.gz 2247183 SHA256 215637bf3643ac5a39fb2594559d871e8e3996a8bd80e9677b724a9ba58427b2 SHA512 bc5fdb2ad5298bae41bfa4ea369748543e0d644fdf0c0c9ac1d2d55e25eb6db634cfde31abbe2d1207f17a98339cbf60efd95b6a760aaa7e2381f2baf7ae6955 WHIRLPOOL 1875ab1f2d6a4306ad0b49631b5b2012c2a3795f94e94266f64efc5fa63c7358ab0b5f21b5db4933759255e515a7476efec388c6efe83a7fc9ef58388bc05242
diff --git a/sys-cluster/heat/heat-2016.2.9999.ebuild b/sys-cluster/heat/heat-2016.2.9999.ebuild
index 9307e5fdda94..09ba96b948a6 100644
--- a/sys-cluster/heat/heat-2016.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2016.2.9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
 	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
@@ -114,8 +114,8 @@ RDEPEND="
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
 
-#PATCHES=(
-#)
+PATCHES=(
+)
 
 pkg_setup() {
 	enewgroup heat
diff --git a/sys-cluster/heat/heat-7.0.0-r1.ebuild b/sys-cluster/heat/heat-7.0.0-r1.ebuild
deleted file mode 100644
index df4661027203..000000000000
--- a/sys-cluster/heat/heat-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/CVE-2016-9185.patch"
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${FILESDIR}/newton-heat.conf.sample" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-7.0.1.ebuild b/sys-cluster/heat/heat-7.0.1.ebuild
index bc598da5e808..48e7cd7a47c9 100644
--- a/sys-cluster/heat/heat-7.0.1.ebuild
+++ b/sys-cluster/heat/heat-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index d4d365dec8bb..83a6f45f9cad 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,3 @@
-DIST bmake-20160315.tar.gz 538673 SHA256 372475f0ab78da5341a1a61af505aaba76356107a1914b3345d79344275cbbe9 SHA512 5addb2b128be6bdeaf93c740bafa102d26224ee8b91e90dbb92333b3f660fdb3837418a081d29718c21519c5cdf994473f1ee75affe4d9e18e5753607ec55ba0 WHIRLPOOL 688c478428b52153384b6fb214807ab57fa133bfe669d8e8c4133c390efad9e5dc11dcf77cf977da5f3eb5581f7ed7e5a5044a3ece615cc8627112069bae52f8
-DIST bmake-20160606.tar.gz 541786 SHA256 4420509062d5b3a8ce970245f14520261f5bd770ddf056dc75d9ba13831fd317 SHA512 ecf8e2e3127c603edc0a29e2cd88d1e5847a0bfd01db08d16fade9a32e0691edb356a1b50f72cdca6d03ce2eeb9daa6e4b1d520b1c6acfe56e4a30f7b03de311 WHIRLPOOL 2e5bb40110fe28e7ef0f5c2a3d670874465db8316977b8cd62f762ba9561176d6fa8cd01db41dd1ecceb1a2646ec2f507373ae0de8cf202c16c25034b3e4f26e
-DIST bmake-20160818.tar.gz 543406 SHA256 d64b23e3e4013b6d4ea590b05251874ffa9d841299b4e5344a6edf45ea7e1141 SHA512 b8474eab965040a047f8b77ae4c0bd6e08e77381b39a746d4255394d88f025800d71eeb47146a358227cc6bc5e383705ca60a78694e8e5eb86869da718c3057f WHIRLPOOL 7451f3cd16b06a8969dff0db1d2e707d34975867625596b3b38b52a39e5aa3eb0530b364de1cb192cbfd2c8bd25c2f2878b531bc858ebf0f14823ff1a49cd6b0
 DIST bmake-20160926.tar.gz 544748 SHA256 5859a7c988936f605120ad3ad127a7c116269d92dd45b559f143f3ee7addba11 SHA512 38c9f928d9178404b9cb32c78cc2317e0947e0a23631e8c416f7ec35523c3e75ab324651204ebdc1928653927f8aa990a5aa75ce48d35184f7392195402ad2a7 WHIRLPOOL 194f40525f99cb2fa2738526fb2300bd2a80f25bc74a073837b42287abeebb9369e7d0121c940675ea160df192eab2f9a7909fd20e5b8628a4ca2fd3a6638dde
+DIST bmake-20161126.tar.gz 545726 SHA256 1efd12863dc91971ca6d497eea0671cdd36815111403a9123a070869563fbf14 SHA512 1bae26cb9339f6da5bf66d26de81f864fb2b58653cd1e39030fb7c0f426dab115235f1babf24c85501457b08dcaf581b6778071edba552113611d336e5aa47ab WHIRLPOOL 96fd71323c66457933d4c5281db1360279f2978006f3d2c240b70e7aa66589117c27f5dc3c5bcffd6d1b4f7f884d61e425c520f0c5662069ff919d8320809e0c
 DIST mk-20151111.tar.gz 88106 SHA256 beebba89da0ba068c904599d3358e6f08c35418b13300fac787c11774a525bc1 SHA512 48fc6c845f2aef3b9be6fdb1db8a62448857ba7cbffc5417f45a7a2d5e59940356a245b9f484aa05e4c585e0a4c2e2eb7577c7d9e942cc673eb561f6c6e257d4 WHIRLPOOL 68838257558b43bc503841cf23f09cfc926e1152f847fcecc803574070eb9c0ceb5fc75c0f78f52559d1dfd7283a4b001c76b62e44158850c0c019a67d69b3aa
diff --git a/sys-devel/bmake/bmake-20160315.ebuild b/sys-devel/bmake/bmake-20160315.ebuild
deleted file mode 100644
index 69d93cf20964..000000000000
--- a/sys-devel/bmake/bmake-20160315.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MK_VER=20151111
-DESCRIPTION="NetBSD's portable make"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
-SRC_URI="http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
-		http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-freebsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	econf \
-		--with-mksrc=../mk \
-		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
-		--with-machine_arch=${ARCH}
-}
-
-src_compile() {
-	sh make-bootstrap.sh || die "bootstrap failed"
-}
-
-src_test() {
-	cd unit-tests
-	LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \
-		|| die "tests compilation failed"
-	sed -i \
-		-e "s:${S}/::g" \
-		-e "s:bmake\\[.\\]:make:g" \
-		-e "s:unit-tests/::g" \
-		test.out || die "Fixing values failed"
-	diff -u test.exp test.out
-	[[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ"
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.cat1 ${PN}.1
-	FORCE_BSD_MK=1 SYS_MK_DIR=. \
-		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
-		|| die "failed to install mk files"
-}
diff --git a/sys-devel/bmake/bmake-20160818.ebuild b/sys-devel/bmake/bmake-20160818.ebuild
deleted file mode 100644
index cce8dfffd9a7..000000000000
--- a/sys-devel/bmake/bmake-20160818.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MK_VER=20151111
-DESCRIPTION="NetBSD's portable make"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
-SRC_URI="http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
-		http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-freebsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	econf \
-		--with-mksrc=../mk \
-		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
-		--with-machine_arch=${ARCH}
-}
-
-src_compile() {
-	sh make-bootstrap.sh || die "bootstrap failed"
-}
-
-src_test() {
-	cd unit-tests
-	LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \
-		|| die "tests compilation failed"
-	sed -i \
-		-e "s:${S}/::g" \
-		-e "s:bmake\\[.\\]:make:g" \
-		-e "s:unit-tests/::g" \
-		test.out || die "Fixing values failed"
-	diff -u test.exp test.out
-	[[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ"
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.cat1 ${PN}.1
-	FORCE_BSD_MK=1 SYS_MK_DIR=. \
-		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
-		|| die "failed to install mk files"
-}
diff --git a/sys-devel/bmake/bmake-20160606.ebuild b/sys-devel/bmake/bmake-20161126.ebuild
similarity index 100%
rename from sys-devel/bmake/bmake-20160606.ebuild
rename to sys-devel/bmake/bmake-20161126.ebuild
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index d5d80c250b66..79c986c13777 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -3,3 +3,4 @@ DIST aufs-headers-3.19_p20150420.tar.xz 3140 SHA256 b9b05adbc65d489e41d8290e25ed
 DIST aufs-headers-4.0_p20150420.tar.xz 3140 SHA256 977e9ca19213faaeae58b2e28b458ee7369c361846f89ec86a043571bab35366 SHA512 fe1d42c66721cf78125070f29fc40dc3f88d84f8a59a35333a427f1d6e0353207ad595a8bd3e12591fcb73a54b76db122d2f2519c7db4dee0557f38dfdc0fe03 WHIRLPOOL 2a92b6dd45a6b52f69e634fffcfbf105fb01f3ad56ee68015c01ed499b0f4fe38e1793b19e05d38f509b2ac1d8f8ce1c1b7183ff746c448697c8270be4be1ee7
 DIST aufs-headers-4.0_p20151116.tar.xz 3136 SHA256 17abd867842d0ff83380576e0824691cf064a2d64fa110530ce4614f5d321fb1 SHA512 58205696948354f8d31230e6b709a136c720de2125bd00fe5929aaa1a70456bccf9c05cbca34412e0092cfd623aedefc8876ece3a7f6b02741a7b1e608aa0f65 WHIRLPOOL 4397bfe743ed047f7f5197edf8e35eaac5c35146b3ee6b7a764225df04f044184f0a5c4b575c3b75c4b02de15be610c237c14060a0cb65c1a40a81769bc7451b
 DIST aufs-headers-4.1_p20161010.tar.xz 3140 SHA256 7ce81a06f2f62c643d417c2e8ff595b99fbdb6339db453c69687e72726781d40 SHA512 d47fe0666c4a1d6d9a78cbd94f790d46fee08bf88a17035ab59b7bb488dc1d8239c612bde06c580edd6227d82993ddbe84a5d576f3daae4d83dd51800fe26b03 WHIRLPOOL fa8286ce53387b4f14586dbf74c3240f7619c85f581987445dabd1571b30c228e86cb2b4166ab9dc1ab8270c4ee2b56090ec6164e2d1924fe175577cc3cd69c4
+DIST aufs-headers-4.9_p20161219.tar.xz 3136 SHA256 efe040dd1642d4bf8043e9e78b58cbc691293f2d659fc0aae2a7d4dd066dc019 SHA512 94054b215e57cbbee7b4096fa14fc85c752054cefe5a5f8d03e43db4ec4c023b75e4b21e4a7164d8a8a4e7c252ff323e0fc38becd4020d926bbf03f7be1f645c WHIRLPOOL 56b25913adfeb3b4579ef8c9302f6e3e81229f1713ff9760828607f6ce0de62eb9779b1194c72bb48b02b5ebe1f23d940b9e5399a5a945980c8610395da36e8d
diff --git a/sys-fs/aufs-headers/aufs-headers-4.9_p20161219.ebuild b/sys-fs/aufs-headers/aufs-headers-4.9_p20161219.ebuild
new file mode 100644
index 000000000000..7c8b14cac17d
--- /dev/null
+++ b/sys-fs/aufs-headers/aufs-headers-4.9_p20161219.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="User space headers for aufs3"
+HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
+# Check aufs release Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -delete
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doheader -r include/*
+}
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 6549e51363f5..861374b8af4b 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -3,3 +3,4 @@ DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 SHA256 46c9e0bb68902fb92028a4
 DIST aufs4-standalone-0_pre20160627.tar.xz 1427036 SHA256 47e8fbaef29d62b7d5856103966e254840771d329dc2a181014d43a19629063b SHA512 c2e3d92fc6ca8968071a40d2773b63ec21fdd2bb12e8375dced30279ffcafcd06cacb0c20a6bb5378704c5de670426d0d92149bb5737507e3515b5df648e1b81 WHIRLPOOL 813262655193abf9fc61b993f70c11e052f5803b66ac8fdfcbd4b476ef03e7ae7c7be13520e9c7c3349d1ab89628dabf6b01a81f98ed82082c15515922ab07c5
 DIST aufs4-standalone-0_pre20160815.tar.xz 1648360 SHA256 35b2b8c558a9927eb6079055fbe040bc790d31131193afde6270f5cc6dd19603 SHA512 a9a86ce4fce04100704cce1acf04b8eeff6a2b81cc591d3ceeafa736a3a8e8fed59538f9301af6cb3ec496dd914b81a3134669ba8871624b2266cc3f731b9fae WHIRLPOOL 68c6241c7680670e68d2b09fdc8008a90b666c9baf49960785c626637d412811ba12582b62830a49309cc8f2b36a1ff874973ad89eb61b80ed0cf02e58a86a53
 DIST aufs4-standalone-0_pre20161010.tar.xz 1635556 SHA256 86d9ba7c401640a990991ca7dbea587ac755253791e0d325ec77ca01730359e3 SHA512 520f47255ee33762f111f93ceeaaee9cf6136c13fb6968a7a7d49388c189e112875f076c5fecdad2123d137a2bc0b74e9c0e6e8913e75dfede30e7a65dd74616 WHIRLPOOL 6b8b1836093ba29bfbf24a6a02231c9514a406d99a5b78bd9db660d388efc9f6e09957b11bc5c3f1f4dc71188a37822e708d48bf5940627881373897b08f3c85
+DIST aufs4-standalone-0_pre20161219.tar.xz 1823772 SHA256 92554aa017279d31c3a3228f32dee70f7dee3cdd105b4f281f16e92900120d24 SHA512 59fc0df19716d8f03e2547d98d6f412e921576d60afd783e5691a07c09b298ee61f491501e07ec154665a56d11b1887f94813ef5972254e6391251a48ba156c9 WHIRLPOOL 8470f594e6ebb6d56da9b4c20d1b372a77aac2e0b7e009e15f76d082b8ad51b287ccc1da7f64cbcb4d513af4780795b811dea1b1f953e306bb23d56a72453a36
diff --git a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild b/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
new file mode 100644
index 000000000000..3e3c7af7b03d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=8
+# highest supported version
+KERN_MAX_VER=9
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-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
+	!sys-fs/aufs3"
+
+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 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${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}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${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
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+
+	eapply_user
+}
+
+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
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild
index 2f7292036fbf..4b3cbbdee444 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/87"
-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/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
index fdfef29a11df..8306efed2eae 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.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="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index c375c0272846..659ff830daa6 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,12 +1,10 @@
 DIST aufs-sources-3.18.25+_p20160822.tar.xz 171116 SHA256 824a1ef783c4091c20e80b478aef8d75bca5c85db79eaa15cdf7fea00416d916 SHA512 045c48c4c4935c22637c39540fc89bfa8ead69b2993c9d258a88466860c4227b99e4dc75234ec2402bdee0119d2554129cd76719423d01ed5a4d74768dee0347 WHIRLPOOL 446cf17e62468e668b1f88cb1ba9901e8030b968b0ec5a4f76cc3b2921962fd3e3a550441ce65cbf4d13152ee08d27640ca9ae5cddd287a1d416f665ac46ebe7
 DIST aufs-sources-4.4_p20161010.tar.xz 171280 SHA256 87c6499fc960338ba1119b0b6487f803c20405f0c5fd569cb41bc26300a75ada SHA512 6029c2e053c739821db56b6e1b014206087c820dce9e884fff559ea1f3bd2ede6d455232165ed6f801754beff71ee9ec351162523d5b6f18c8250a38f2f6f5c3 WHIRLPOOL 3b38396832c9bbe3f53d5c2d0275c47d1b6feb55649ca914cc84173916026b6a4252e9ea9b6067544347affb07b587858f8bef06e61f501a4c7b101c14edd7b1
-DIST aufs-sources-4.8_p20161010.tar.xz 170924 SHA256 f80b6f194fcc4ee39c6f5bdcce912839d523d33ed610e729947d841daf2ee84d SHA512 6cf1814dacde202f61be9fdf522990b339952a708372da9d078aabd1a68a5a77e673d74b5d92ae9baa6ada01454636bc0268df474c4dc85408d490543ed9485b WHIRLPOOL 5e0ebb52a4c7bf0951d56f62f85b61ec8821d9d168a0444c439f4bb7b09c6f6c79065157752427d629e35335c3fdcb20a47b0f1f74e18fb926551a7f82226002
+DIST aufs-sources-4.8_p20161219.tar.xz 171176 SHA256 6b77b397a8dbc97a0155303436cfa246233b5f88fec431e007434fbf0f3eeb78 SHA512 716cc42b963dfab68abb75df8bb434f22ac1679c820af172dd8839f8f6f21c7d20f797f6cd6e6984102aa708d33bf7309e2cf53ef4b1ee9f66f1b5baf9195748 WHIRLPOOL 2ce22c0d2c5778ae07c89dd4247635352566a2365da9fed753d36833f1b48ed4fdd46474b27793ab181639f8d379b68f0faff5c764a19d1743f4e0edefb6a6da
+DIST aufs-sources-4.9_p20161219.tar.xz 171648 SHA256 164a0ab6c37d895987a62118db81a941c7c2843b35e823ce2d280ca52d99e62f SHA512 19f8da87afdc02ad4dcfeb4282d6088f32fb1134bb217641fc6bf3a632a5f22bbcca2f2334c939abd6017024d160796b4088a977686d5833ffcff49bdde333d8 WHIRLPOOL e0f16073d7a43c10d379a6298169256f57d8be502d43d5cf7edfa5b25c8c6707d53db4b7092134c055b7d234ba35b8f69c2ec7a99b07a510ad81ef81c42122ad
 DIST genpatches-3.18-43.base.tar.xz 1120732 SHA256 b56698cb12c7fafe59365ff569ca525fe8c0d399b634498af015e1b04a62e93d SHA512 6319e15cf7860bdb40abebcff1a91878a0a8187314f24fee53bd5678fcd958dfd0e13adc756cf371373abce9b6902b4b629e389d5ace78c3a2364511487ea891 WHIRLPOOL 416dfcb63a9468dd74909bbeb0c7fa8b8786733daa022bcd1ba405a33befc399cef9d55115e8c79178d12c204f2f8b3a3642966398697dd3aaca72643e2d32d5
 DIST genpatches-3.18-43.experimental.tar.xz 61720 SHA256 1f5fcb3613c13821c9757e7ad2f7b0ef0a0d51602f41b769a4e62e289c30c21f SHA512 947b151ae7c5c85809516edef3e50edf84d9543d9d6d6bb1463cdce20cffeff413f73d4326973ef9bad2d87aef2992e39b950c734068a934b066718790344f72 WHIRLPOOL d57650c9fa527124354db6b9f2ce8b0f7127f2ac4d5d635cad3a79c6395448ce0a0069a5f5ee30965b60e7e600371ced9dfd780fa9f640eb0ddc1c9785ba4314
 DIST genpatches-3.18-43.extras.tar.xz 16176 SHA256 5c2df2453a5d742d5b47758cc095910d5bb42e93ac3c7b4655c1d8ebd8c609c3 SHA512 f1f3365e62e059eb119db8cb789eef8e217dfeb1f350e9dfbff57789f1226f3c6fa31df69e86f3883af1ea0f3dd00f96d8a0b40508568c085f52604a4d9f1088 WHIRLPOOL aabbe19c34cad23ddf5ccb251afd8b735f1c1e4e3712e0d2c06ac6219a6ebb24f4f0dc8f5d5c6049e02a47b3d86e9e1b39a6324cb21c6e7b30771106a967ccb4
-DIST genpatches-3.18-44.base.tar.xz 1128740 SHA256 bdee2b3c2421ba678a62322dcb8aca2af52b3af2969a75889fa04160c1b53634 SHA512 291e30ce58cee0013b83dc5e4f6584697c730855855e267508ba3cfd94c0944b7e316845fea004ba7a1754f2b1a3992ac152f0bb898926af5fa081d0d5e71b06 WHIRLPOOL 5023d9251463e725d8b4ff9d4480a8083890c7671fd1f501497504134e9778667a489b2368430349396327fc4a7943aab47f42964bb5247173108e0607f73285
-DIST genpatches-3.18-44.experimental.tar.xz 61728 SHA256 69ebc4cbc6773c2d7d543db96fcdfcfe83f36c9253d2fe96e4db05372c062a40 SHA512 383d34e50f42a4883c922d3803d0a90496db69d38853ee29ddfee75162e7d646a3762d0125d2ccee7fc7de0fbd8f35a410ecab14df4ceaf2f472647459b2c7c8 WHIRLPOOL 8075283ff021afd649949857ad3163ebf9a228d400b2a0268ced31027bea00a38aaef3b402df6c3ae0aaa85941b72276b0865132c7f37f8faabb90d72bfedc56
-DIST genpatches-3.18-44.extras.tar.xz 16408 SHA256 5523eceda179a96c8a8704dd175ed3500498ca7f5610ce0244903b63ec841792 SHA512 b3214e103cad6f442cb2c11f894dd82e89b0184675fd464c2e0dc6a5d71766e40fce1ab6bccfe53cce8b3085235dbf65bf2b29f231cecc96ad9781adb3eb6cd4 WHIRLPOOL 196f5992deea32bd12c2a3ebc67324259d130887be1fc87ce2ba4f593158043cb4c245d19f19fa9817b2c7ab6b84f453169c2438a6e64852ce1c9c1f749f8ff3
 DIST genpatches-3.18-45.base.tar.xz 1129464 SHA256 70795d777e2076e75a8826f6e85dac7c701cbf5f151c9ce11c5cbef2d95f7e0a SHA512 f78e275519eaf98946b7bee7e0f806c2b2c0983d22ec0502e39e0147a35b0829c716a11ff296ab0fd634a64163678a9b1a76017805e413ba820e42b36e7cc4db WHIRLPOOL 15e44fec693874c2657960c2564f7945c880b18c431d68d935ba3f065f751adec2604bfe5eeaa852fff5f4c527e3bd83fb88fab6a064e7a513906a4673c406f5
 DIST genpatches-3.18-45.experimental.tar.xz 61732 SHA256 b4b67f6f20c4a71ad97c0791445c744cd5fbcac0c274acc8ae1a323e5255de2d SHA512 1ad62d4f1ff57a24bb0e3737560ec3a7bcb3a4de07d64fdf3de17bbe23a82acb31c823ad92282e0b2d32eca5ed424cf4b99b86ac20130d88c91e3e41478e23fd WHIRLPOOL 135f6c5125f28b60ed6aad97441143933f74b7d09c75748133836ba5fc9190f832351b1d39ee9850dfd17805494a0c3442b3c0a7bba52a4f88dda4de9112c7f0
 DIST genpatches-3.18-45.extras.tar.xz 16404 SHA256 501bffca23a82219e96af8ab29e2f23acfebf0f5be78a22419585a2a6e00180c SHA512 3951bbe832b9cd848c43d17e65e79891f30ef05b51bd6e64c202f9b6f713619c448fa91ec2d79ce5f842883aa2f91c804feb8276e51fe61d7bb57552326dd919 WHIRLPOOL 57299f70f0b712a50ce767b4afde213afc603b284588ddf412aabf8a101f661001c848f6d00be704b0f97756e08bb9bb7470380df4a33ea932d5f99b7b5b591a
@@ -16,27 +14,19 @@ DIST genpatches-4.4-28.extras.tar.xz 16360 SHA256 6c1331851468c372e7f9ea2c456b45
 DIST genpatches-4.4-30.base.tar.xz 823044 SHA256 9c57b8bd64b62a4bf24f8fde252d5bdaf44c3ae86d759836b9ecd46eb1f6bfb5 SHA512 f50d16367d433b8118082dc1c7e23df1109c52065b09287bc70bd7d811f2ab000a94dd4f62c89a7617417d8d0df65cd2156cbd209687ec42be62cb7a36c5d569 WHIRLPOOL 93a2d5dc5da2eccb39c3552b5d56abbf93b1c72936e6101d9d0538d62c01c1452152cf8e7205b7c6391dd258388d469b9f0ebd0ee6c9ed0b95e2d65eba4ef3da
 DIST genpatches-4.4-30.experimental.tar.xz 87764 SHA256 284dcf0dc30a5845f5a9c82f2130ff4b196f8c92923a6b6053a7d40010b45848 SHA512 cf74e739520ca8f4fd7108558bd581f61bfd7b73d94dec699d21ac53fddddac657db0994c5e71017c1cc079855d2699798489b7ca899f904e00a3753c5c154c5 WHIRLPOOL 96a94e53cba14b6acb44e1c67b92d8cf20b7fde0a46e99f9cf896c6ff49bb7c2e9682aec46a5e93f2d8c63790ba9817772f0258dbd4a0f85b215d4876e277bf3
 DIST genpatches-4.4-30.extras.tar.xz 16368 SHA256 5ae402de247df572e8ea70d8ef23808b0c162cf31d4623327897ae54933adbf2 SHA512 edbd39ca766fc808ac34f868f28b05a0f8275fd5d1e62c8036d5204bfef34694383a07925c3b589d32d5f8ed8ac43fe1391d49071f02d7ac33bdd8249fad6b58 WHIRLPOOL eee136234d33cb39f5956e003eac9449889227f82a17e137dd8dd22a6dd8dfe7adaaaae4973bded4d0130771465aabf4c35b6e69220d20a9b4a002a5a93165e6
-DIST genpatches-4.4-36.base.tar.xz 885164 SHA256 57dda7bc44a7443db8c93a97db4c96e25e4e4f154e1f57c33ad2c71f71f874ab SHA512 44dc33ca4d977d0313f9a5a9ca96522bf4e8d0389a50ca9013f4bcabee5b7fe9587a75e0c121984459dbae19c4648dee71e79b6f3add8bc1e2bf9e77ce2da3c8 WHIRLPOOL ec0a292e5a14e8d7d298d05b5bd9f3dd2a81536ad5c2578d5ce041e3786af795aaba7e3567d1e290dcd57570acccd1c86311cc60bc25c259ef0fb3e62a848964
-DIST genpatches-4.4-36.experimental.tar.xz 87760 SHA256 4f46c90e7f4df95d2c83de8b08d52ca831dd269ec0c81103a46846dc92bfe9b4 SHA512 b508fbb7a57542085dfe4f37b52ed0ff7e53a5b516db40360eefcfa556c6ae7b7813b97e6fa8175be82007696ff586eb6247a881b794eadea15fd7bf0fa705ac WHIRLPOOL 228c1ab3b5ef249362c3a92ecce3c86918fcd0b89bb44cf5f564cfdd4345ee600bd0a5888ee341d39e5424e356d07a8cc4125bb3bda2831d9f04df3c6221035f
-DIST genpatches-4.4-36.extras.tar.xz 16416 SHA256 313b4322ed7fabb9067bd0d5c20e67b4ab7cdcd59bd97c3b426161f305234271 SHA512 0f66916ffa293433a6e7737290b7032ed5272018d6f551c709f2986231810e130eb47290a1369df098d945e3805dbde06a756b6dd71525e833d9de9cbe34026a WHIRLPOOL d93a1a15bd3bb87821147fb24522485bc135557f668cfe31ce3cfdfe955ce733cc936f4f6f0fca02d73855d3214509ed0a4a13c67c25e87dbe3d9abc0c058ed1
-DIST genpatches-4.4-38.base.tar.xz 893240 SHA256 fb72de532c75e4d5d5d6de7bc479b458453a6d953291639178f0f01a6e3138e4 SHA512 91ab6916cb899b81bc5a001ef2a65134027834bc1b1dbd82acbc804be74c7872609c1f255ac4a10612801abc1d412d954ccc739284299b9d6f9aff19666dcbb5 WHIRLPOOL e11ca4e847590838d8613a456764ae56ec9ba55cb6bf173a9c3d7f53e998bd3ea7ffee8554b2ea4906a15d1ec65b4bdb16c1565e3d34ca48c52a268c8bd7fe76
-DIST genpatches-4.4-38.experimental.tar.xz 87784 SHA256 b565b3eee775d7c256f8ddefdc5e8c21c52e550e327cd41b417cdd8a060dbd67 SHA512 a92363efd9642417c384520045ebf92f588a13c8fd8fdc7d08933736f98d7496ce88619b340cf19c342df7439dfea9c980bc36947273cb3aa5ae804fa011c8a0 WHIRLPOOL 58012b32aba8cce88452ed9b53a18b9cd5a53d21a9c64f14da64dead9755b6756eac70f0baff8ed827159ed1b4edac88d6767c497e11dbe8ae10aabd1b011749
-DIST genpatches-4.4-38.extras.tar.xz 16428 SHA256 b60496f1217495d8ff3800deb49d305e534e9a73d1cd452748262e9f019488dd SHA512 9119130185fbb9b692de51baf99d1f6ac481e416bcdfeb3b1500d5275e82c92e4ecfb0745b9e9a3df8ee2c679dd240b317dadc3885689274fcbd5da626a31ac9 WHIRLPOOL 7d94404d7bf843045e2a7a1b9e2ddc0044c6e555186fdc4d5e9977242cb5a9bd31514b1202732e18c6e823406807083925ca7f31ee523c0771e8c19224567ac6
-DIST genpatches-4.4-39.base.tar.xz 899828 SHA256 527ca060a613235c8e991bc1556d1fbcefe61f76121e8911dabc0627ee6c474a SHA512 5ff2f81d6bcf7f1b0d5e768f3c440c00e60403a95ea7fceba56ea4d77f2cf230cec22b5856a53d3105fb0ba1c95eb4854bc69710b1094f0dd411edc1dced2921 WHIRLPOOL cffa9cc9d3f149e42dc06ea2b31e20cbc7e9e5f5652a081da4bfe59e82c876f66ae54916b6d885452037d578051c3888d1bdd940a193d4c5520132ee99e709d3
-DIST genpatches-4.4-39.experimental.tar.xz 87784 SHA256 9331896942c0fc5c87f05405db8205768b7b20abd5780095be6d608f32147e1c SHA512 17298c94b0a76066f520a76f48e88e706e1ea2d0c874d4523ae1332cbc4d4a4a007a3e0b183e54f7051c532a3755bd576d543bc7fab42a2ad57d3f38db9566bf WHIRLPOOL d42d9c42a7f881b91f380a43b693d5d8ae063a3b45cc3111dc9ade59a49e94381b7adccb1c13b9e70bf9b06194685289ef93968f780a98c95951374e1f7f7ad6
-DIST genpatches-4.4-39.extras.tar.xz 16420 SHA256 a1ea4470421a41f0020f226b90af23c0ea611841491332b8fa69ff4d8e78fc1a SHA512 a31a8cbc4f0292b791c9918ec0912625c320b8f77360f2d2daa9a1433abbbc6e55003b1cdd6ad3fa95311c1836ed99307316a29954c2df29f1ab7b1eba02d041 WHIRLPOOL 76aa5dd008ebbd1ea898e3be385225a959980725b8779e1f78d7aee213c3369b035e0fe1917462e49150343823deb59b90d7c869be1599238602276465e2caed
-DIST genpatches-4.4-40.base.tar.xz 900384 SHA256 37e46efeff392dc9e60529bcb5968d41509f7584c2452837c1aeefce8aec433e SHA512 630979a3e8366025327961d8b83d7558f57dc8646de1dbeada48bf746a32c238827a9038861d72a7747ae78aa1eb5739ca2d87245ae2528e17dc57295e9b4dec WHIRLPOOL 2a1082442dde035407d918fff833ec0585d600490d700049951cb6c50eae543369549aeafaf159c69bfc1789b965f3a43cb1920747ba8dafbe45ff36e0e7e856
-DIST genpatches-4.4-40.experimental.tar.xz 87796 SHA256 88cc5074b3365417f97e319fbfe7bf3b4dc0af2cd7ba7041a09c13b1799f51a0 SHA512 f050858eb451258002a56fa2ca5e659724505a32aae5a8f7f0aed80dfbbcc681ac9e08eaf20dc963782e64d77938d255472a97a9a14d9682aca824b4ca6d66ed WHIRLPOOL 0c7e385760c343d4e00249874c32fda40970d3c79bd4120efd01b54a2ddfee429f00a14a64b7e91eab4d861b984b126c5b8ef7ba903e944fdca1ee64a54b412a
-DIST genpatches-4.4-40.extras.tar.xz 16420 SHA256 e8d9995830a65146198ab957a95b3d5397155b56150884ebe8897a7a1dc2b072 SHA512 0212316ca623b87ed9c3154107ea246e452709cd48572882af7be0ff776cf3aa978521ee4c7c82e62d4d3cef5412bae4f90def577b841f61fac529a317aa8106 WHIRLPOOL 6b9188a4007020125e5bce136273b1e9262ae8f863905fc08e7ac3a1b41848de11b54dd6426c3babd8e670997bc1c0aed8073800bb04ef5fa4242e350d2b0572
 DIST genpatches-4.4-41.base.tar.xz 903076 SHA256 2fc1ec72c69851617430b023ee34e709e3381d35b9e9d8a304f82497fa9b122b SHA512 756cb5f4dd790338219d753721805b178838088cf9fb283971b0de17f3f25e5503cdde3c7f12d6dc9ffaffcb6280335c7bee16027adca8a95ffb63482575c6b6 WHIRLPOOL d662282e974f1fca142b85518df2018fb6572df6f642600eb7136f02dcc77acb3b2e519387c8979a3ae55cd05a9f09f04dfb5739186ebccb42d33e3b64492982
 DIST genpatches-4.4-41.experimental.tar.xz 87756 SHA256 7e0a05f5392ea0a0a773ba6a213099fb5e5e7f160d0e97e5efbef75949634edf SHA512 bc4f6c73042af681216df63ec45163cefa59cbd2a7c856d0eb5432e4d4b8c274fb2459004c900ff401e90c691cb299c20a0a136766eaa7155dd9af8f9ba28c7a WHIRLPOOL 910d1607f6b588433e50a6645e7d947b73a5f92f9fc1ce8d3c4335d59f9b7009a1048475da411ea8613d1614cf2aecd447fa160cce4a0d8c54544444ee746381
 DIST genpatches-4.4-41.extras.tar.xz 16420 SHA256 3bb432cefdaf61a4777e2fecea0e668605c6cdbdba723fdf396953c5beb94ef8 SHA512 de4ea7d47034a32ad3e3013d23d841d2112719016e6789b1b4d2821098b0adb8ddf9b97e53c3b605bcffa1bed9c2ad86decd022813f20a6d60bd06f469019993 WHIRLPOOL be0df2881d58d62d2d11bfc1387b0bab69565a82b19e52aec7d9c3dd3f1919c0555ba70e6cac8b7100e949797216a875cec6075e5cc334d4322a28d539722ab4
-DIST genpatches-4.8-14.base.tar.xz 248780 SHA256 abe559e7a15d2bb125811ef28d455baca07092b6af93943803e1079f4d4f6fbc SHA512 4a30f10dcadb47cd02e4f4992ef7f7d221872e03c254751320bd9977bfc59eb27321a02cec6dae1bacebe734adb3d04d022ea019c30f75b943f65f9c0dd49ea3 WHIRLPOOL 77bd42de19550647fbe6c22804a0dd71455f006055dc8c7f5fcc9257e4052b42293a3933dc71400bea198db50656747176777d94c40ef3926100075fbdc6d383
-DIST genpatches-4.8-14.experimental.tar.xz 92004 SHA256 0e574fd254afead4ba164f40fec008f069f78f94100cb04f44b5a313906e8ecb SHA512 fac626c3c4387ab9121de9b10b5fc8753991a326c773d243bc2f7d8c4833d83864458036d3adeed6cf7f7f3d0fb846cdbff707d55d216fe5232e5c842ecdad36 WHIRLPOOL 26c0c1e9a6a840e32d533c7eb4492679f5452ec36b8fbae043b0f7888af71386bb5863c2dc46e299e6f8a54c2cd5d451cd4c71945d6bd185403c11f838ad8d83
-DIST genpatches-4.8-14.extras.tar.xz 17308 SHA256 c64cdd104354fa9d5cac6fcb543c164433cc5abc2f5d85b868bd60464213c83b SHA512 0befc3771ec97707673b94a9183d8969a9f82dd7ec89629ea62dc6d21b023239358ac31cf96f1ef09ae329cde68db45170156d8caaaa29facccbe290521c3601 WHIRLPOOL 61cc5e3d5e69d02716507e10800f41742c8f1de744a8b9e9d2308692890b98292ef31487e0152e1ff24848f81504e5b60a98f89c840bd1a76ca049c487c0bab6
-DIST genpatches-4.8-15.base.tar.xz 256616 SHA256 8e2b0088ccc69454f516d7b2ab8799367c1a58f8966ec047c1376e80d82733bd SHA512 22ac9ce0565b2c8a8559cbb88aa42a2a6f6b470e8ce5d55c409b1fcb802e293e21e93dc8b4903033b87867913e833188d204962b4439000af7ea3af438ef1b85 WHIRLPOOL cf99a52d2e9158ba2d47704bff500c5c806afe723dbe7f4ad1aee8132c95760c2d70a95890a9ede777364971943bc02ce4bca194d010ee488020a53b23a194d9
-DIST genpatches-4.8-15.experimental.tar.xz 91972 SHA256 eb971ac227b0849b7839df5ea30745284cae242010b5a7fce7af675f6b371bb7 SHA512 3a5aed0e619ceff2b3363fcf08c331924508abbb2eabd6a05f32e1cdb681116ec3f5e27bdbec7b11ac83a45583f671f2d58f54f98161f4b9c6393392dd6f8d9e WHIRLPOOL 5ec4d9982c85632f30fea693ed7a3d65fce408ccd80bc8815b78a76a915152c30ee9b48338f4b15019fad4f54d983f6578f316dd28be9d562a4abebb89b613a3
-DIST genpatches-4.8-15.extras.tar.xz 17316 SHA256 c760ecc18f8ddab5d6bc71edea58e1bcf0c6b1be6f448ccb5f572c2e02234961 SHA512 6f5e51d921c340f2ee6dad1141f5d01f7d1517dda11197510ab2ee2cf64ac0358ad0ddbd5ce8935885086a4580df4de6e908ecf2f73998fa388b59a71bea0c02 WHIRLPOOL 1a8399cfd39b38553cf6e26b3e6112c7dcbc2a9189eff724fa931f5ae634fc321860d9cd344936fda584753407ebab7018d597790ad93775dbfe5799d7e31ecc
+DIST genpatches-4.8-16.base.tar.xz 268656 SHA256 1436e623bd2296cfe1976e307cadbba1e9b2ec9d50211c7f9e832fc1b38f9e0a SHA512 f992bc50f706c2fcdc68c731dfc3965ba11c13426ce1437dd3277b82d1824681ebbd07a6350e13be453e5154f75e291129d09bdc0ed1ed0457b290cbf5aaa999 WHIRLPOOL 7eca460ed8a6c53f425f4ba1adc869beda4eee64847b4fe5c0576f90440d8a53f3ba98334f7170e83cb975525b091df88ea8e7cc9099ee7edac2e30e93b089b0
+DIST genpatches-4.8-16.experimental.tar.xz 91992 SHA256 38bbf0e911602baed1ef7f749626d4aa156f7c1100503388f7ef1c670b21c657 SHA512 94719f52e70753ce6cf60286fb03689be798fb77dc73e900bebdfc67170fc2154ba3432ae757b9f12c5e2ab5cac38b627c099dda4fe565a9a5b1297ddea18d48 WHIRLPOOL 6197840e8eb9e22fec0d3810b1e33d9fd4ea861105166b8a649cd03debdb17b4d00aa4c595412f5b99d04c1fc70df30d83c7df0f3eddc4de4b4cfc96ee733386
+DIST genpatches-4.8-16.extras.tar.xz 17300 SHA256 6e5e1a38ec23e71e8b4a2c385c1963fc5fb7d94efe36d19695c9eda769c8d9cb SHA512 0dfed59c281ea1ddd2074bfe3d68a37afc31e44bab721cb3aced63267bc5a74d4cb60c77d15abb2dd0c57f49f65e742f9fe400d2bc3f709ec3ac598195730332 WHIRLPOOL 6683ae446c09b92afe09d07581ac7dcfb112a29d311a4d4ca657ac4a86a56a4817331da3e78d3d1683cded44194fd380835b7d8184e6adbc6203570472417096
+DIST genpatches-4.8-17.base.tar.xz 276508 SHA256 fc31b2404fda311360da1520669c9d0a687d7efbcd3f52fec3c7b7f88f356816 SHA512 e927e780d6fc36f4b3739e9ea7cee65a41ff90fc29358c3ee353693f3328f03192a0a50cd444fa06ce41783b67228e82eabb6eea86cf6fe5725f1ee0db05c7df WHIRLPOOL 25e9520feb937ae7aa3f747f334d898d465e89a56c4f25de28b390ba7de74b1b66257ef4a20c4e176c7e34096819f6b214fa2c1b69b0680b1a8ed97638d113dd
+DIST genpatches-4.8-17.experimental.tar.xz 92032 SHA256 523533d957a94eae5af2fc7d1d6bf9bbf785a2203e507cf737cb60fb10a880ef SHA512 c8d13c2efd01fa2c19a2da6ee00359297af8a887fa8a50008d785d330e62c13cf50f0522e6568b10dbf29a5a469c8c1e5d2b0c595e56886b8bfb1367f0cc4316 WHIRLPOOL d109e84848c22d4687c0f8b123dd2eb72468a668dbba8a7e1100a6d7bbc6137b63eeb223498c13b098d2d8fe16ab5d5cacb5bc9f44a839dcd3c1605dea40752f
+DIST genpatches-4.8-17.extras.tar.xz 17304 SHA256 3857eccf543621d0812dc19e5f127d5d38e2c0ef1d104be350fc63b6afb59d16 SHA512 5b05f764fb8ae7683ddf0e7b6b1425bd624421f36ffd829df1e2b6601834f614814d5163356086e190dbb4e9b456984f9ab3d7facbb88ae31d9a1a27c174a43c WHIRLPOOL 95f8a2293e5170e8c3e04b2cfc5be7acaff1bd0eb50f2d68abb826411136b82db668124dd6e292ade471bba182779caa586d0a74a32020fd16457eadbd062ceb
+DIST genpatches-4.9-1.base.tar.xz 3052 SHA256 2ea85fcf27c22c0f278e8e08be467fcec012d337c31292e11de9408701beb56c SHA512 be04e4d0cfbcf09c9a3c2bd13a272675fe89a83201239da519df157d19c7796bca89b8325828e012d4f221cf053c1f660a1d3c9278bbd818f5724b054d557882 WHIRLPOOL cd0b44ea97f46e85c94a70f8ff37449a0c8f9f6b162062c392b56e7d4e40ddefdc4bc75a133cfba6325b410ec15eea266c1ebc9bc43e341bad92aff5651f3ee9
+DIST genpatches-4.9-1.experimental.tar.xz 4272 SHA256 2ba64defab0be2447c1d262846cb67271b9851c49c8f92b2cdd76ea066881ccd SHA512 877510ef0038368f3149939101f68c4fee243e9c2225712d9e9b3e8b54d4ed58bdd8b0c10bdf1442042c6aa8e8f2a3685c5f7f1ecdd9c45ae983f16e5824c4e3 WHIRLPOOL 9d6acf966b09987fd19f6556798e37637cdef6990eeac517bc9f0690dd16fd22b86296a550a32e88581099b619738bc94f385c6a21baa905d1de341e8bb5591b
+DIST genpatches-4.9-1.extras.tar.xz 17236 SHA256 e93b547700d725407f490aa7a1c28dc0a01f0a8176ee53ba082c84273624b88d SHA512 a1bf0ff7c65a8b06cb4a5fbe58e4f74d8a93b1aff07174960c337df4541feabb7b2b80768e71214414b8c2541f7145411f3e2a28778d655867964bd8f3b1ad87 WHIRLPOOL a9302ff0c11319c7147b4613de8a29b16b9694af5f9ff5791a6ccfe2f9f65b3b1baaea92038a3c104f5e1f9bf8362c52f3a66d7172f0dd4acdcc8cd2465e0977
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
+DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.45.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.45.ebuild
deleted file mode 100644
index f0b232d05c9d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.45.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=44
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=3.18.25+_p20160822
-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="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	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}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	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
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-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 || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.36-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.36-r1.ebuild
deleted file mode 100644
index 2d6605e06ee8..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.36-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=40
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	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}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	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
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-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 || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.37.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.39.ebuild
similarity index 100%
rename from sys-kernel/aufs-sources/aufs-sources-4.4.37.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.4.39.ebuild
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.8.12-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.12-r1.ebuild
deleted file mode 100644
index 29c4dc01425f..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.12-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.8_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	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}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	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
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-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 || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.8.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.13.ebuild
deleted file mode 100644
index cccb6986194b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=15
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.8_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	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}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	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
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-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 || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.36.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.14.ebuild
similarity index 96%
rename from sys-kernel/aufs-sources/aufs-sources-4.4.36.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.8.14.ebuild
index 03252f3610d6..a997bb6373bf 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.36.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.14.ebuild
@@ -6,13 +6,12 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=39
+K_GENPATCHES_VER=16
 K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.4_p20161010
+AUFS_VERSION=4.8_p20161219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.34.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.15.ebuild
similarity index 96%
rename from sys-kernel/aufs-sources/aufs-sources-4.4.34.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.8.15.ebuild
index d1cea8612363..948761d0035f 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.34.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.15.ebuild
@@ -6,13 +6,12 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=36
+K_GENPATCHES_VER=17
 K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.4_p20161010
+AUFS_VERSION=4.8_p20161219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.35.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.0.ebuild
similarity index 96%
rename from sys-kernel/aufs-sources/aufs-sources-4.4.35.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.9.0.ebuild
index d26fba9583bf..16819f4c82cc 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.35.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.0.ebuild
@@ -6,13 +6,12 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=38
+K_GENPATCHES_VER=1
 K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.4_p20161010
+AUFS_VERSION=4.9_p20161219
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/metadata.xml b/sys-kernel/aufs-sources/metadata.xml
index 2c331637e418..b971bbf4d4db 100644
--- a/sys-kernel/aufs-sources/metadata.xml
+++ b/sys-kernel/aufs-sources/metadata.xml
@@ -21,7 +21,6 @@
 		WARNING: This flag will drop all support from the Gentoo Kernel 
 		Security team
 	</flag>
-    <flag name="kdbus">Apply the kdbus patch. This also requires the "experimental" use flag.</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 85fdac3c3c2f..636cd8a42f31 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,15 +1,6 @@
 DIST genpatches-3.10-100.base.tar.xz 1315848 SHA256 3173e7f08f92619f6cbe72cbe1ca057dcd47b16d0dea3eae8f47cf8c626fe484 SHA512 0d3fbe9bf88370a60f750da6daa973bf8dab6f4039f007649985d50baf4a5c30d0f3f7495d07c369c5c31e101cf5af7fa673737f72eb432a48e303c59906fbae WHIRLPOOL d80764b8f61b582c0901071ed91b8c4de420339101819b2d8ca610facd2927d283e1107394006c5c981a3ec70f4e2555e845d99b88ca6ac371d6da47c3bb8958
 DIST genpatches-3.10-100.experimental.tar.xz 60176 SHA256 dac68be2307878e46a29f3d0209c6cc3ce42d25441345e92e7a3564ea90d4aaf SHA512 f645210f454312ffd9fa34665ccecb512c34628b822cb9e29e84e85bf291954a3bc609e48841a5295c13334efdf0f42d0e33284fd022319e257bdc81763ef687 WHIRLPOOL 7b063586942c02935ceb9564e7a5a012ce2bc41fd184e6e3f8b48999b030070c7cf199cc59be18c615a7b40e893b1447ab7965671a8419d9b7995ec18ac8e501
 DIST genpatches-3.10-100.extras.tar.xz 17844 SHA256 fcfeae8c28d10aa043b86c5f272193e54c8757aa9f7d1068f6ac157a856fb8d4 SHA512 8e8b0f2b1b3a7dde4262ef4825c7efc718930d74aebfc5a80820acb301e1f37f29fcd72ada6269d2ec579b260d3f4d0d2caa17f68d1bf0569fc3967d436ea0ed WHIRLPOOL b67b0f8314f6f9421631398caecb3177df8b1cb5023447a892c0b809192252158a3ae9728abcaa14905eea76fe9b9f78a51e988abf9ce32903685115729875ef
-DIST genpatches-3.10-106.base.tar.xz 1383744 SHA256 c98068b044a0d304bf07e3f673ba8e5da867cb6d9a5d35a61368e4b767d0b3ba SHA512 46c938deed26a295fb66cede7e753d9b6c5a7e484c953a3cba25d8a6e3199716be85139878e417cae97e854a34da0136872a1311a0778ba5c7acc34f752732e5 WHIRLPOOL 0def5ae5cbe1321b4d2554a005d1528fae674efbdc41d5642b727fce315a820553625eb385069689cfd74bb961a505f0a981a24fdb6667253f599c354e7d24e1
-DIST genpatches-3.10-106.experimental.tar.xz 60156 SHA256 855c1e33dc01d02b83360882e73fc8b074fe08812c2d937b0a44296d558d48f3 SHA512 0f7e22170170c18c4037400ce9de6298aec39bd20a37f05bd2cc25d638ac9f35a6d29fdcf6fddaae5ffbc05c3d591be9815e7bfa6f003a7bd4d134412e3f4868 WHIRLPOOL a090f08a555aac35ff98f0c132ba82f39ff2d670eafaaf3308bed3294cd6366deb44c3e0f4bcffcfbf1e21c3a7cf69e32db9b26508c06d09ba94f2c7e0f79833
-DIST genpatches-3.10-106.extras.tar.xz 17832 SHA256 8c1be1873d2f220c9186fa5a1c65549220e5831ab3e27b044590186ba315e1bd SHA512 3659c3c5f00602cc902aeef2f4d1ca46ea4b4ae1ad947fc0fb2774d0299a5475caf56815026e40867eb1b12f4ebb3fef85fc4cc682a08fd6743fa0125f53bdf9 WHIRLPOOL 15a97ff6f24d9a14480a11d6ff0be90b7ed63c1165864812837750b466ed7b53a9eae3a1f8ba513c63fc895983f6b65e67b04dd7cdd48e0ca26b1be7be62a1cd
-DIST genpatches-3.10-107.base.tar.xz 1412392 SHA256 7a5782b69dcc31d508a51909266c19f5ddc3d4e4569e7cb626017b857aef145d SHA512 685190b37592b6773bb12a0c83887318fd603c943fe4a6e8641317ad18713599bf56ef089afeddb37c4b85b5cc5c7079a73178adcc335e220e8bec52b064070a WHIRLPOOL 7e3ad3cfa30530beba0515d5783b86521521a936a823515d946c53a2d54a52a2dce32e642ddb2e459703a4b438c41fd8d0236e77ec93119301eee88bc3edf0b0
-DIST genpatches-3.10-107.experimental.tar.xz 60176 SHA256 19da11e664bbcebf5e254a570b202d2108a7e43f3d84dbb637cdd46dfe5a0b73 SHA512 0b1b2171775b91401b2e2cbc533624a09db76ac54614c26d79d5bfe0f64976a8c905fb3c414d3ded78bb4828e4941498f1ea813211098ba09122b085956fc8cd WHIRLPOOL 0881f441b3e57fb517f47e082d2c6fbc3d1c45443c555dcc5cb91875f8ac7e92363205b38eda21b4041b3b8727c772f8f05390ca758c34e0e199fca2570c7369
-DIST genpatches-3.10-107.extras.tar.xz 17844 SHA256 0fe48fe102cde238b059adb3cee832ae782dd77b72cbb95ef4ad0f72e34cdb67 SHA512 e0ad9fc78466e952da29aff9870655f3115d1774340f2cc848f906ff0c5edf43dc47a23ae7c86caaa8d6b97cef234c66f45fe9bafc3da5cf202fa331849006bc WHIRLPOOL f4e709c67e543dc6610c2d673e38608cc5d7063e5a0099d7c14b8ae9e890db98e89fc7a270dc822bb2ee083f324fff52a4bba584d350b61c6aef71cf498e4e2e
-DIST genpatches-3.10-108.base.tar.xz 1452496 SHA256 7b89c9fdd9a6cc55a893a094c62bdb711af240e7055454e2958a7ae1c0a9a7d7 SHA512 9b41aad068329716b4bc6cee8092c4e49517f0d6849db0230d9f96e4e81e85bc80d6d0a0869a49d9b46ee73d6a5030f3eed266103a4ce329f9daa06f8111086b WHIRLPOOL 31ee31462a2969524b34a3d99e4933fa93ade3d01e85e0d0b6265d090104f44cbbfc0e0465eba47a3455e33a1399f22c89a312b3fa2ceee6652fc0668ba469cd
-DIST genpatches-3.10-108.experimental.tar.xz 60188 SHA256 35344ffaf438468b787a07a655591ec7698493b8515586a374a58ebab04af2fe SHA512 5b54efa85048baa8aa83d563fd8864709fe1e3fec69522d65bb0b5c62c5493fc2c46fcd7462ac87869a080647cb29932ac1f12b72a23ae199ff106643a8190c8 WHIRLPOOL 34ef55677614c0dbeedc11761cc7fda7d401bf0c825c128537c572fe76eab3e13c82e3887f9df436f763667cf2af376c81265f912a1690fb65026cf3749e3efd
-DIST genpatches-3.10-108.extras.tar.xz 17832 SHA256 c30705c1d70cbbeed0cb8813555762b16caf56a09e284c483c43ccb80116c135 SHA512 de2542562d9ac45e56ddb965fc96a7810fdaf270fdb2ef2550549803f2b3a0bd54884ce9f36a571db57c3dc797d6f1a3b241348f8b8d2d9e0c27b86569e3aff3 WHIRLPOOL 9ab54144a595adcfc1a76c29890f8e1741bb46fdc8ab1172855628cc8c5b5552d3e3d811d6ebd5bd3a8ba23e1ae1a9b7c11959850d994ba02da8fb3ee0b6c936
 DIST genpatches-3.10-109.base.tar.xz 1455712 SHA256 c32369d77f7be0c0326b535ccb75daf5592fea1519b158ff18ecbbc438b6ae78 SHA512 32ae8fd99afc6a107e61e10922fb31bcacdb7949e13ddfd4361eca6e4370a53a9af424461fffa33b8532bf0c3fedd690897a12b1fb42160c72ad692b2b9e4510 WHIRLPOOL 316321687a9ac38b1a957e44fe9ec2555dcd861a990ecd621f8ac22d88a5fa9a7612df1b10017ac1678498aba0fb841dd1685ba24cfcc124cd1b052cce803237
 DIST genpatches-3.10-109.experimental.tar.xz 60148 SHA256 0aa9ab163f40f73bbf7f3307440f11ebf03cc8c36b506f4a62f26890bb3bc900 SHA512 01ae789f16e3aa7b58d38dcaa98408ee8eb6fe2db71a1002ef9bd87e595aebbb542d638e38d5f8beca8ab55b58b283cd20893cffb83122a2725a062f1513cffd WHIRLPOOL 4fb1ad62aa8e43d359b5645a4181c05daf01792b538c328f0b534632d522610ad005c962f79b1bfeac04a3fe5720f4f71081865433a516955afd48ac70c96380
 DIST genpatches-3.10-109.extras.tar.xz 17840 SHA256 401cc66a7f10ecc54ad3eeb06deba59282faedd0cf52f5d5322e81e171b6e5ee SHA512 a39bdb505a8f75f82e84b48f8696df8f076f03479bf48d71bef3ea582d3658539564c50787d1e578fa7a1ce158ce50c602810038412258f11529d99166ea2c1d WHIRLPOOL d63c3d5aea291f9404ece9321c742f46f6cab72d4704a2054f2737d3301185905a10b1d8aaf7f67d0b385b64e8af36e331bcfe32e028b99aaf0d975ed3375e4f
@@ -19,50 +10,27 @@ DIST genpatches-3.10-110.extras.tar.xz 17840 SHA256 a6132234cac426d840e4be500d5e
 DIST genpatches-3.12-49.base.tar.xz 1545256 SHA256 f9503fdf958458692b841b95fcdbc561a7ef4ecceeab1c2e532c0740305a25d1 SHA512 4475cc1e1faee3975598115937869564274053cff1a9dfbefe41b9535846f1dae04abd784541af5925e805e9878ce1590cc2eea999c06cb3ca67b80df94f23e5 WHIRLPOOL 25758cf3bad2a875668950923edd3ab481c8fe7f4faa2512a2ad70acf3f4f360dfad0c10bd4599efa60bcb681c29cfb2db5f4b3f8bc82cc792a369517891bf02
 DIST genpatches-3.12-49.experimental.tar.xz 46536 SHA256 927d367eeddb6823534004c5a4c96093fe822acd5856d262003045935617a741 SHA512 3ab1222cbd073437af8697b9407ff2dd4a1890be5acaf70d9e14ff6c6e908615a7f6c8a8b3c0def7660e925edca457c6b31fea64b2ec73200c36512df6efa3f1 WHIRLPOOL 7d600343ae9e5109e04507176b7914ce2421bf250e2a5f9812122820760060093fbf9112fa9e906f8185c99eb14fd873f198f38da4a3ed7b92c884ce0ff01358
 DIST genpatches-3.12-49.extras.tar.xz 18232 SHA256 5800be892a1828498d914ca9315cc5315c2493f900390eb493f7ef45bc7d346c SHA512 b3cad4524b15e15867ed4ae56efed8e59be1d570fe9e822ac381dff7d5c7cfe35af730511a1693ee6f82a48f2e2dc9718b39c37f5530aa00fe18f23d142df4e9 WHIRLPOOL fd8b5bef919d3c155aa49d7c4587c3e3af785ccf1bbff47d0e67fe05fd3d9e4abae8626ba7d44bcded366acac04f4f0ed3244a8ccbcfd886840ebc1663fa7bbf
-DIST genpatches-3.12-62.base.tar.xz 1755476 SHA256 8aeec06527a19c091b173da858687b0c45beae8b58d5e3b7e6fb727b8d64bea3 SHA512 0728260b7df4c94fb7ce833abf18ca0abf80eabde02f6e2ac343eaa803b508553229bb9f9b1899157d17ed1cae47203d8cc18257d9f0b57ca2c975e0dc34b430 WHIRLPOOL 57488efe5ab1685c8a3e1f128a017a88399cca6a79a375124e1cc28cce3764a53fca749fd61bd164bdab8a45ca28225a76767a4a8687faa0054a65befb92996f
-DIST genpatches-3.12-62.experimental.tar.xz 46520 SHA256 f4e18ee8bba52ec8ad7f534593cfc15e868594719cb26033945b5ef9090ff772 SHA512 e11d28f48d7f1fb4ccf09541d306d404b829ef1da90bbdac86dc689c0b8c18b305c0065ad8f74b1fe2dd1490f0e91073e41853a4a935284d53151b56d4f6e4e9 WHIRLPOOL 01e121675bb32ed626f0346a3f9a063db2a9471ee0d129aa87943586f68486f86292f1da14e4388f30a40d919c9a357f562a655b575de242e89160079d70f9ef
-DIST genpatches-3.12-62.extras.tar.xz 18240 SHA256 998da2e9d0d5e5904ae224edef7d3cd06270a31bc2c3c55f8cbaf891280a1295 SHA512 f2c4d3259b0bf78d898013c630315ee8f053a5ea42ca8831ca191bb2ec578d0c9800d47a7384238711e186a85d0f9b750db0e8b4f4297ce989520aa9fb8d53ef WHIRLPOOL 1dc4d344eff9e365843f892460c70820724d2f07b66bdc66d862eacfc31b20306d469bd52da3efa2c1ba1d7a35650e0cd4f1d8967376c924d547aebfc37acb49
 DIST genpatches-3.12-63.base.tar.xz 1797456 SHA256 7e249c88a354cefb8cdd70f02af7833e09f18bfc1eba1e2c316fca193d2e0481 SHA512 a716855e79d5c57ced6d6472c348859d0bb6fea7d25026d280f904bd0ae3e5bfefabbc7780ab7f7e8030beb48860588cc2c9b4886c5da638afc2d597e750314b WHIRLPOOL d63efbbfbd444991591a6c30b508714d7dfad1850e9e2332220d8d91e21b28cadc2fbf4ec2d5a468f937778373051a5b9ffc484f7fd5bf47d83c5cae01692175
 DIST genpatches-3.12-63.experimental.tar.xz 46548 SHA256 cda73389807dbfee7533467da5aaa0a808f36dbd8e6f6267d59e3047f2240f6c SHA512 6f081f4fa92fb9d012d2be9b4e20584265b5f758262a69a1169df308ef22cd2feec6f44234e94bf7b348f6af7b16e842746f6bdeaf6df3a5470722cf125b30b8 WHIRLPOOL efa811850f4dbe77486edbe6af14d98ad2ad926b4c217a9300f359197fc96e4e164caa777db89f769448922e47d1db786232012e771e2426cb45246f6a783aed
 DIST genpatches-3.12-63.extras.tar.xz 18232 SHA256 64c0a576b6a5986b4387686bc0a7c9e974870dab81a0c6da9164cd00e75b4a5b SHA512 2e2b33fd1880fba59014d442c2eca49325f6edff174fead38cfc1d547b62847ff6aa4cbc10808db9b72d9f7a7a694856ef3470de3537e072135c34360c71aab0 WHIRLPOOL 09f841a94d032ff2989baedda68ce3776814e826c8e084255dbc4a57ec9d2d6dc8f4126c7bb43046c335f76308575751db7fb515a0976bee8878fabc78b723b1
-DIST genpatches-3.12-64.base.tar.xz 1816960 SHA256 59fe8188ea1247994e9906adbfe7edc505efc55ee989cc1707cc40beaf896b4b SHA512 8ce8955c4cc724a31754375403d274d7b8c9d024d1d78c3febac5d17a56c68e57b1558047a68128c34fb2b82092ff6d18c6c46d637c29720cffcb131e67afaec WHIRLPOOL 9071d96bdb669eac015e9563c15e3a3132d26b68b0544f4c4a0d050abf1ce7aa7426de9e036616c48de1edac681f93f3ced6165072eb5f3ad8491db5bc6cbcce
-DIST genpatches-3.12-64.experimental.tar.xz 46520 SHA256 7164044f01e563dd302388fb9095d12ae03f01a545ed8d2c23f17da992451012 SHA512 9cc09d6a9630e284d7fb9791ce287c7097d0e2740a5e6bc014a7fb9d89edcb4a7c889386b0eee166150c7186659977ff3367f464eb133e945a89daa813556f12 WHIRLPOOL 1db91de422766cfdd57bb9e3e54ab49908ce86066262793a2806c424611b9c61d1116ca2c1d790fb6947a31e091a8b246b27e15de19d37c0eff97ce8718ce782
-DIST genpatches-3.12-64.extras.tar.xz 18224 SHA256 c192fe1fcf60132bf0b4b60a13411d6b9056f274465235c98371376bf3966a6a SHA512 408cb20f83574e63bd8cdc810230755653ba3b8f88b92e13b8a11798c830b421365704ad9e12759e7e91e763e7ba8279d983e92370c715347f35b8050c1c9ed9 WHIRLPOOL e8fb3e82543deeed87139a8c9152bb573972453f3b2ca1906732842a8a3dc063bbeca604ca9a85284f7e2c3a381c78ee3ce8439c97240db44ff50913b75a33ba
-DIST genpatches-3.12-65.base.tar.xz 1844216 SHA256 c6f09ab5ce75680a393d79121465b6cd1c90c4c58eed1b4a7c48e674b5775223 SHA512 f9dc2de2a772a6f7949601fe62d1b8839bb6da321fa344abc6f42aa188abf25d24040c15240dab526fffc4ed15e0d47a9a0925b88707cccd13b1eee16ed3520a WHIRLPOOL 303a5a7554203f197774f6af2f611cf79ae8634b68c846ac719b587d3c226602c0d4cd3a339f8a6ff04eeb480ecb8164bcc41790dc37e1945a119165719852e0
-DIST genpatches-3.12-65.experimental.tar.xz 46520 SHA256 c5c4700eeece80bb9ed4574d9b19a262f2408b94a676771a0d6905eef2cf9a42 SHA512 5b96132e29b8bccb2aad2a445f2e7c031b20d72f4895b6268835e3c64312b9a4521b6ad9c678be91a79bc9136ea3e6b046752a90dc0e938b81ed60bc4a161a26 WHIRLPOOL a70597aa57921613f8f826a60bae571a6e3bdcb9eeeae8b9f8c356415ea4e2175771f5fc63caf7bb45659c3dc934513bc7c428abb22a0b64015bfc0bb2088184
-DIST genpatches-3.12-65.extras.tar.xz 18448 SHA256 70d068a221c29c78fa3d0bb6b2ea39051973206016059bcc7bc05ae65b7dcdf1 SHA512 a8e88a764a385f171143766617187cf17a6095fd2296ef69c44eec3b9b2c723f4028022c8514ca87e4cb48af07cf3e81175d9d5807c255d356ce2b1c1a2f5159 WHIRLPOOL f0304edae47b54e80a756d6db6c506874a8020b01378aaf2e7eff4f757a39e0c5b3007fba7575956fbf1501dd1e9c0957fcedd69d9acf4785db2cf08f82e9e9e
 DIST genpatches-3.12-66.base.tar.xz 1844776 SHA256 17fa905b1cfe3e845ec47f6c517727154c36b25479a574ff3424af6761306f40 SHA512 0b42060eab396eaeba2e5da38dc67660d8d8687a016ad417d6cb78618464f0e75206e7f3996c0535f0993d0c2bc80631ae859b2d9e5e9646448cf3a65c8cf44a WHIRLPOOL 9ec54c043419d52ee771173df0173d3eba4bdc7205f22e41021b695e637eb598097f7c80256906d49d5a799a9cbc378ed45389cae51b79f717b01065f813fff0
 DIST genpatches-3.12-66.experimental.tar.xz 46536 SHA256 d35f0563107c6469abd12a933f21f19a7b60f79a044149206d3c58f1472f168b SHA512 b9b75b10534aef49b83eb5fcdc9861fe6d5287ded738cf1d79ef44b15fb87c0abeeeea5078646f421987d8798182cdff20d82c60f5b012b7395345daec14c3c9 WHIRLPOOL a68d75e9efe3367d6820c201c0b94af010e05d1906408ee133bad2697b938f195845755b68fbca3a7ed84d8c0d4c94a1c10587bc19ce32865dac59c2fc746467
 DIST genpatches-3.12-66.extras.tar.xz 18464 SHA256 612f1d0841c9a27eaf726854ca214698ac3e8270d42648f4b875f750c15503fb SHA512 c9bc7bfb5363f473daee773e1e06611150478d0dbff1305624c727a5c14b7fdf2177740bee360f466f1e8acb33a3e1af12b8aff05404b297d55d8932c16651ba WHIRLPOOL 245aebec8b402ca29b52c310214a9486d93eb82faff5561828ba00501a3bf78bc67972acba93c04992b33ca7253434cd39067781d6306eff2a45c26d730996c2
 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0
 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5
 DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285
-DIST genpatches-3.14-86.base.tar.xz 1321084 SHA256 e23388a3d573aec4a2c37bf32bd229d7eaca861347c7d9c0387c532567ee8596 SHA512 71d907bab0dc2f2e5772800da144c796a13bc2fb271eba79fc1d44a69a6f550b0f248fee14d2011f1cb16ac877344cb97e9a217b98fb3cc904e54a2b9dec4571 WHIRLPOOL 7f19d18f456e30dba047d67b1f14eeb90a835c37ec7f0b800fbdfad55b50abef8bb9d630cdf8ee69b15115a00635653c0afb0a4fbdb59c4dd447876e38e210a1
-DIST genpatches-3.14-86.experimental.tar.xz 60292 SHA256 3e144e62c6073c87198f73059a0224ba9b2ca3317846f8bc24667f4237dd919a SHA512 0a35e5aeb93fec9f3bb2a1de66ddd89242b8b9ecccfecdea95edc6fe6f871667309bc2ff48c8352615c5da63d8d66d18f4c6694509db80341014e96bb3436253 WHIRLPOOL b31f66bffe1cc4da4c0f98a3d8ce0c8eb2c4fadc8f4f8107972643af6d518bc0e060c766231e31b4f0d7ad4f0b8b2fd95044eaf28ade49e9be747b2e2fe2f47e
-DIST genpatches-3.14-86.extras.tar.xz 18272 SHA256 4066d37006ceaf7cccd94d46092b13550963970ae21cb74d0e7728d3c3bfc7d1 SHA512 b9354c38ad7946750abe190c75e45ca19d2a47f8dc3b62ce4af36d7e203591d321a9af38e50513d9f064ae701046e64e77a4c3310db6c008c0b17a6efa1739c2 WHIRLPOOL aead8969c554e6ddf19f4bc58e70b89cf8bb41b804008ab0fbff8cd9fbcd0518dd78a157015336905d30b0e8df2eebdb869c0f0d352070250d5ab56fa4698ed5
 DIST genpatches-3.14-87.base.tar.xz 1321636 SHA256 32349ddad80f9ac1e5e8fe602d904a74612f513d9e8218ee2ec2a794ae9c130e SHA512 0d8544febe1141ae37895d735a4a0e7af6bd56359d3ee805e1ed357734f6531543b39baa4683f8de5734ee47d0ae5c91ad88ffc9801d536fbc6ad380cbb12333 WHIRLPOOL 85a4a4296007b11d265c0f83525b6ffd8a40da53e72a5789ef15f03bbf49fcf67a2a13c0cbe1edde1aa160eb2b69dba7da5dee95539df546d6517aadee57ebd3
 DIST genpatches-3.14-87.experimental.tar.xz 60296 SHA256 25777c40acca05f295e8a10b082bec49633c8eb2a4c29b9b8902cef298012fb8 SHA512 958949ec1a551de916ec6729474e2e9ff5ae7860931deac4096f82558d4126feba346bd1fe1ca9ca90e9e410889a830e4e3dbe41966939f9a148b86c31c5673e WHIRLPOOL 38fa7d769484e996ffda09fb344d6d5240217066da6199e351f924704b1f9505cd17578a9cbc88a176e0166e62c6f2e9f05a2a4836db9588dc10768dedf8f038
 DIST genpatches-3.14-87.extras.tar.xz 18256 SHA256 a1d4ca1f8307edca8b9e5aa419da89ac44fc56d17fcd8dbd49167b1a484805de SHA512 b9a1cde9a33dbe99ca9fad536ee9e87eb84e61312b4e82a715af8be24d786990a0274852206091318992674ee98660e3e62d31073e79aef9887321c8c7373536 WHIRLPOOL 372fda71f781985fd274f48d44180b2c11d68d6f41e0e70c02f478f6ceb1a547a5646d02ef83e347d329122a4db619b966dffbdda24b40151ae7a840861d70f3
 DIST genpatches-3.18-26.base.tar.xz 753528 SHA256 0a3d2a302b64284353accbff19ff1a78128e900f0d4cbb0e70920034b68b4bba SHA512 723a29074dbd6970b43974655539902a92b5ba3447cba754f5719971848e2d2ca450d888a83d41fe35770806e842615bb5c5425aebf8a7118e5cd39470aafcac WHIRLPOOL 17e49e01f19a9710e6c3f6b6bb3b50ab96829a18dd60a57eb10058656845ba8e497ba4c3043f3824d69f79cb5c911c5fab6f4b8e28aa39acaa5083fca732dad0
 DIST genpatches-3.18-26.experimental.tar.xz 61608 SHA256 e72de3a8865519ed658a2a769b42e2b4592ba5a6e5c98a699fbe4109f3567532 SHA512 75cd10ac41180cd5f4a1e70ea49b260a141b875f3f46dfa5edd668e507b27fe7244033c76d1e895dea58c8fc69c43ce21dc8e711884438c10b686d53c0b4c8a4 WHIRLPOOL 267a2c1abcda2d41ebf64a6034c60e73249dc4c0984326f516ac92eb16145f493549e690bfcf8f6c515984ab56368437e392fba3648f4bcc57db0351d5ee6863
 DIST genpatches-3.18-26.extras.tar.xz 16188 SHA256 af0d5013a7cb6e0ec78bb5821bb4f83048d953cd10734b57085439fcdc44683d SHA512 effb9ef5722a956a9db49582b3c8aa85f5838a8573138ce867e0575348a291ccc6163e7bb8ce1698f9b5d799e81e151546c1bad59388f80b984e86f98ee8424a WHIRLPOOL 52adaba3ba161e7d1bcc8234edc9efd06bedca2211085990069b1ea8e1a35ab443e5ebfb49a7d56c3d572f9e7e69de1bdfc463abf455ba7e3155eabcdff3786a
-DIST genpatches-3.18-41.base.tar.xz 1101596 SHA256 b9a683468f00c8de13f3e29fadd972bce01cbbdc8616d9689a55a7f067a7d9d5 SHA512 4ec479b6d810eb2bf141c8ec19c363739d548512e81a5a651a8c9ea11e3e46278a544d847c01b253e4d64aa3ee2d029b75c4e3bdc04d8cb71caa06e32e254575 WHIRLPOOL 10aca13e6b9645ef3e0b891d36279e016c3bf3d8fb3b734300f06ec7b8550da689c7937a2ad8f7f5521b9aa3a164d5a07683ce43021dd9053f7a447b126c4c44
-DIST genpatches-3.18-41.experimental.tar.xz 61752 SHA256 d376cba324755d86b26cbdf462da6e28be46063b6a252ede7a20605086c17161 SHA512 91ec04beca0820e1200b235c4f9a1bdc49ac288e78a2eaaa3b4dfe21e81e553ea4d8cfbcf5da261fb5dd8f736b53d0782d033f1c70408b6fba0f644d7bf356a0 WHIRLPOOL cd5029bc5f7ef9cb3b6f9310fad49a4a5ffed34cb995ed1fac81114bf1d542d8c720ec6ceb5fb920f31cdee772d4d623723abdb620ae067f41981cbb21237b16
-DIST genpatches-3.18-41.extras.tar.xz 16184 SHA256 e5b6cae811814629110c1fe46d3446aae3c8b49c0bf99203f5b055d601095a0b SHA512 27d69455dbdcbaf82d6fb24aaefc2212f7f49fe6c511db8527a97515d315ce142d3daec1e7f7d2ce72b96398f6cab8f7e51f193b61294029a71ab591075f0288 WHIRLPOOL 34eabbc6e0fd9667d145230e411b4cae7565e67bb110a08b5bff3cb11460f060676f0b10c48595f2bd48075f19d107eaa19021039db8ddbd3e2d903618e07beb
-DIST genpatches-3.18-42.base.tar.xz 1119348 SHA256 cbf2b331df87e9550ecae055c00693cca0c22c6f1855fe300c7ce8ecf8256bf9 SHA512 846abc55b81fcc71fadb3b1f301ca66a90016b3246615f0030be2902593cb7381529e7d320d084d7b8cb9a4a71ce5025b6cb825662e91868a9d07890ea44354f WHIRLPOOL 94df72a05bf23caad45f7a514fb1de4ca4867dad9db171c2840a0615f5f864e44c23627c92598c080b87e2477eae8cb4c3026030e301d8465c04714f5ddbef16
-DIST genpatches-3.18-42.experimental.tar.xz 61740 SHA256 120555c088458b0d6970a66bc755f13bd08a90f707cca99fe377c8ea893cd93e SHA512 fcbb5f9689eafeb723015dccfcacf9d4e72dff36953f322510642d7b162adc44ae8f3dc20ccaa6503dabc4249fdc722947236290b99a032754b7e72cc2a9d5d0 WHIRLPOOL d971b11102f34c2e039290124547e1aa903e2a069a3bbc12b5d864d12608bffc5cf275a30bfaa2b335823a7ca5c025125d481840a5772f55a7ee43616cd39818
-DIST genpatches-3.18-42.extras.tar.xz 16188 SHA256 f9006f6a725254184d5b98e2107eec50b04734fd4ae4be4f54e3c0e9affb7daf SHA512 f8088f56b94ebb7e97e430bcf17e46e67c3b292fcc80cc65aaba31f73fe3793ca8be4b06fb42127e8a436ceef8ba2f6f3f54bc758e38d67e32e34efd8f49ca41 WHIRLPOOL e1729cc21dbbe0319d20289ef8c70362da80f9d9dde423c85eb3a65fe1ab2e13a38f9cc1ae886297b387c3e18f8ee5dd21a8bfeef391aec2e166e55e374463dc
 DIST genpatches-3.18-43.base.tar.xz 1120732 SHA256 b56698cb12c7fafe59365ff569ca525fe8c0d399b634498af015e1b04a62e93d SHA512 6319e15cf7860bdb40abebcff1a91878a0a8187314f24fee53bd5678fcd958dfd0e13adc756cf371373abce9b6902b4b629e389d5ace78c3a2364511487ea891 WHIRLPOOL 416dfcb63a9468dd74909bbeb0c7fa8b8786733daa022bcd1ba405a33befc399cef9d55115e8c79178d12c204f2f8b3a3642966398697dd3aaca72643e2d32d5
 DIST genpatches-3.18-43.experimental.tar.xz 61720 SHA256 1f5fcb3613c13821c9757e7ad2f7b0ef0a0d51602f41b769a4e62e289c30c21f SHA512 947b151ae7c5c85809516edef3e50edf84d9543d9d6d6bb1463cdce20cffeff413f73d4326973ef9bad2d87aef2992e39b950c734068a934b066718790344f72 WHIRLPOOL d57650c9fa527124354db6b9f2ce8b0f7127f2ac4d5d635cad3a79c6395448ce0a0069a5f5ee30965b60e7e600371ced9dfd780fa9f640eb0ddc1c9785ba4314
 DIST genpatches-3.18-43.extras.tar.xz 16176 SHA256 5c2df2453a5d742d5b47758cc095910d5bb42e93ac3c7b4655c1d8ebd8c609c3 SHA512 f1f3365e62e059eb119db8cb789eef8e217dfeb1f350e9dfbff57789f1226f3c6fa31df69e86f3883af1ea0f3dd00f96d8a0b40508568c085f52604a4d9f1088 WHIRLPOOL aabbe19c34cad23ddf5ccb251afd8b735f1c1e4e3712e0d2c06ac6219a6ebb24f4f0dc8f5d5c6049e02a47b3d86e9e1b39a6324cb21c6e7b30771106a967ccb4
-DIST genpatches-3.18-44.base.tar.xz 1128740 SHA256 bdee2b3c2421ba678a62322dcb8aca2af52b3af2969a75889fa04160c1b53634 SHA512 291e30ce58cee0013b83dc5e4f6584697c730855855e267508ba3cfd94c0944b7e316845fea004ba7a1754f2b1a3992ac152f0bb898926af5fa081d0d5e71b06 WHIRLPOOL 5023d9251463e725d8b4ff9d4480a8083890c7671fd1f501497504134e9778667a489b2368430349396327fc4a7943aab47f42964bb5247173108e0607f73285
-DIST genpatches-3.18-44.experimental.tar.xz 61728 SHA256 69ebc4cbc6773c2d7d543db96fcdfcfe83f36c9253d2fe96e4db05372c062a40 SHA512 383d34e50f42a4883c922d3803d0a90496db69d38853ee29ddfee75162e7d646a3762d0125d2ccee7fc7de0fbd8f35a410ecab14df4ceaf2f472647459b2c7c8 WHIRLPOOL 8075283ff021afd649949857ad3163ebf9a228d400b2a0268ced31027bea00a38aaef3b402df6c3ae0aaa85941b72276b0865132c7f37f8faabb90d72bfedc56
-DIST genpatches-3.18-44.extras.tar.xz 16408 SHA256 5523eceda179a96c8a8704dd175ed3500498ca7f5610ce0244903b63ec841792 SHA512 b3214e103cad6f442cb2c11f894dd82e89b0184675fd464c2e0dc6a5d71766e40fce1ab6bccfe53cce8b3085235dbf65bf2b29f231cecc96ad9781adb3eb6cd4 WHIRLPOOL 196f5992deea32bd12c2a3ebc67324259d130887be1fc87ce2ba4f593158043cb4c245d19f19fa9817b2c7ab6b84f453169c2438a6e64852ce1c9c1f749f8ff3
 DIST genpatches-3.18-45.base.tar.xz 1129464 SHA256 70795d777e2076e75a8826f6e85dac7c701cbf5f151c9ce11c5cbef2d95f7e0a SHA512 f78e275519eaf98946b7bee7e0f806c2b2c0983d22ec0502e39e0147a35b0829c716a11ff296ab0fd634a64163678a9b1a76017805e413ba820e42b36e7cc4db WHIRLPOOL 15e44fec693874c2657960c2564f7945c880b18c431d68d935ba3f065f751adec2604bfe5eeaa852fff5f4c527e3bd83fb88fab6a064e7a513906a4673c406f5
 DIST genpatches-3.18-45.experimental.tar.xz 61732 SHA256 b4b67f6f20c4a71ad97c0791445c744cd5fbcac0c274acc8ae1a323e5255de2d SHA512 1ad62d4f1ff57a24bb0e3737560ec3a7bcb3a4de07d64fdf3de17bbe23a82acb31c823ad92282e0b2d32eca5ed424cf4b99b86ac20130d88c91e3e41478e23fd WHIRLPOOL 135f6c5125f28b60ed6aad97441143933f74b7d09c75748133836ba5fc9190f832351b1d39ee9850dfd17805494a0c3442b3c0a7bba52a4f88dda4de9112c7f0
 DIST genpatches-3.18-45.extras.tar.xz 16404 SHA256 501bffca23a82219e96af8ab29e2f23acfebf0f5be78a22419585a2a6e00180c SHA512 3951bbe832b9cd848c43d17e65e79891f30ef05b51bd6e64c202f9b6f713619c448fa91ec2d79ce5f842883aa2f91c804feb8276e51fe61d7bb57552326dd919 WHIRLPOOL 57299f70f0b712a50ce767b4afde213afc603b284588ddf412aabf8a101f661001c848f6d00be704b0f97756e08bb9bb7470380df4a33ea932d5f99b7b5b591a
-DIST genpatches-3.4-95.base.tar.xz 1463092 SHA256 9863107c059d597e5126ec025b464d6af167125b6a72f02cfbdb462198d7a193 SHA512 7e0fb0c5ee1b60cc99d6ac233db551f65e2518d1133aa8c58dc33c3096a31e7ea73b7ac12b6f7072083a601a24d394e4594ee1615b8eb20173cde07b44db0b50 WHIRLPOOL afc6555e409152658bd919bff1e7828c1a86f4df146aefbce40e1a85740692c11f573863f7da8034c6da184ffc02c22854e2024cd8673d8891c966d0264222fa
-DIST genpatches-3.4-95.extras.tar.xz 18232 SHA256 93a4cf21c8ade507bcfb0500fb7b1e73e324a817b906e5060ff46be18bcd485f SHA512 12ae9f224970cc92eede0b87cca2db9b67d093fd0228105ad4fb4a3914206dba6d10299a5d6a0073521f03141456b4a5be795d54d9d3aa5ed346c014a8fc356b WHIRLPOOL 599c698e464ab7bfe641ca1fa2ddab6be087ea67dc055e43971908d2e860b150f8625335f3648ec9dc0553f6fb92928d8c2a3308c73744b73c39a02d3a6f014a
 DIST genpatches-3.4-96.base.tar.xz 1492036 SHA256 5dc75acc50da0da153e2d374690c9da56ae2f0bf818d589bde749326ea998f4f SHA512 e22aec7a1b9f2e4271fe666a8b750b1b5eab21ca05a298a785ed28e6f209f11f6cfe7e0c14ceb4f9a027f6c9a8853ef26bc91c487234caabf72c9d0c110f0dff WHIRLPOOL ebb47d781a6207c54637c03ddb9452679ec3fc93535542087f5713f893b01963542072dce343fdbe569535055fa62e646bed3c0b7daa559ee00acb97ad1f907f
 DIST genpatches-3.4-96.extras.tar.xz 18232 SHA256 4943a7821c3518f5b359bdc6802a69e36bb02a580fa023513789dea1730bd469 SHA512 2340238580655e70de67a5f0b31875d4e33ad70218e477e55addb5e963b6d4868133cd3593566934568f4e7bd94aa5e4b9ed9f01d5b0447bf5626784be246f39 WHIRLPOOL 35d00040495172b10c52a9b3e4a97ac643bcf0497b547b3f66ed45c413f181dcce245e1beba3296ec4441a5e2b4a666fe15b26e9a5a41b7c4af22d78e14edcab
 DIST genpatches-3.4-97.base.tar.xz 1492500 SHA256 6266de3989981edb8ea0d23ec0a24ae1e25b0a770608138c9dbe964e4ef63070 SHA512 d459c7eca973adc3d502c735a1bdac17053758b3d959f178c4d3f6f24c70436d7ef8577e1587361e800fc39f93812b3b23cd1a50e75da51a322e078e0d9ccc16 WHIRLPOOL 266ea8bc0f4d14d7e2eb98851a2a73b830f87e140030450f1d1c5d298d7e2d259bb69c2062563eb36e678e64f2b9deaeac644958d517b52329b174a98e34a1d7
@@ -73,9 +41,6 @@ DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3
 DIST genpatches-4.1-40.base.tar.xz 976932 SHA256 63d47d4c461635b610745d98bd3e373583f82d4e3f18cd13302ce73322bce3e4 SHA512 cf2a667088c1a7c5fc86c0d069f5e5fc1ea177a528229e5ae5b9cd8b46ca6cdabc2e4a26a12693a2a5e2b97d197f3f690a5e40e114e54a18a40699bcb0117323 WHIRLPOOL c22ba5950d556355cfb337646555684dc761196968a7b713a3f24c5bfc1f2e31c077fe5a3661a8686e6eba612eaf8067055412ecee123a6b217a8e68607e2436
 DIST genpatches-4.1-40.experimental.tar.xz 61760 SHA256 954cf6ec74ea8ebeb63796109a3e68f266fecdba927262b5b887003bfaf31b4c SHA512 bbbf42c458244fb5a8bc6e9f4f58d51c2ffcbe4b80cb54e885129398cfbc01f5852eb0448dcbe6ae366bce5e891a71eba93f2c67701b3bb4f7bb162dcd57c295 WHIRLPOOL 06b324496cfa7cbb50d8f483057beb144eb6065931cece37cd407b9cf73a0e5fa45df4e1c39b0b8e339e5bca0aabf524473f0df5d150a53575552f31b60cc0e3
 DIST genpatches-4.1-40.extras.tar.xz 16360 SHA256 146604f5f3a771806154cf79fe36b18d08b2461ead18d41b1063d89b78c37d08 SHA512 9cfe180f6d7be0bc8397d26561b12d34be9c89cec60099b127efc0e77c5713eeda9cba6a230d6dfab1b7a9a6aa3632742c3ed2a5e87ff4cedcc45030efa900e6 WHIRLPOOL 90e1e18e488eb2c5f2a18b56147ecdf962c3202e739ccd448a7aba221cac0652bde4b72d6c44b2d3ddbaf51159e81503257b3bae9187faf926110b5dc84e7326
-DIST genpatches-4.1-41.base.tar.xz 992540 SHA256 087ec3a87e84e563c26290359fc15d5499347a13292c73d39eb31f59e5a12e91 SHA512 7cb53098fe7516eccb5d565fa77da6343a1b91740dfc774b4742c23c1d5d086801795c4501e07def5406fc8faa1bfa108ccb3c74a1cc35c777273773cb51b85a WHIRLPOOL adc54d465a903ad50648187178a4c43441a687073488138113acd22044e72559a762a7ee33304694974472346eef2a5e01a1b6ff886af28d37ee5218d9220855
-DIST genpatches-4.1-41.experimental.tar.xz 61756 SHA256 585a3fb824c24f284e50cb90f5ee6846cb23754db6a1f4d75488648d1f85de81 SHA512 66cb28e31519b908395286feb7907c8df482764e09c28f97116da1dea973e631f7dc2ec71e6083d511ca26cc5032e1d3b468889d3a46174df90f5d731ee9fcd6 WHIRLPOOL 993c30706e4cead01907355f5d2f26e5acf5d6f510dbad8e9156953e8dfaa712faa7ff11fba185f94c25c2d8c19fe05dae726101f46fb923c3f8b0c86a87bc9f
-DIST genpatches-4.1-41.extras.tar.xz 16420 SHA256 49f0bf4f91b93ad0444bc92627719138d6862ebb751ef5d97d00bec9c9b287ba SHA512 a87501ce2c7623001257de0e35420c390203e4b071634d2836376e57294ba94d5b1728e44cd65f4c991530f676c8de819ce1506494b31d3efa33422f66dfafc5 WHIRLPOOL 54d2e140574cfe42b77984c3018f1eebca74d62af2a3a59e88c1fa2027bd877c79dda9c5086912c711653679cd3e1a1e7938cc5a87332c5f52fb2ecbb6f0202b
 DIST genpatches-4.1-42.base.tar.xz 993064 SHA256 55307bbc766b16705f95e5369a5424725b643e1b12a9c10f7be356fd2dbdc48e SHA512 e0e7a0f264cb4cf9d3058722c4db2828046f791b0eacacf3ec4deea6561b4078f6feed94627a40959ef9322de804a5526dd77cbf241b5447798de8dff3888b2e WHIRLPOOL 51329804ac2186475962d13c34319346753a4ec88d6b6ba62d1d4a60cc05e1decaed796783b71036421618a54d357d7be7e385b5e186bfc5ee9fc52acf95334f
 DIST genpatches-4.1-42.experimental.tar.xz 61752 SHA256 d86a0373c4665c5f634679c267a37a488055fea8fe78c8ec0aeb727c23ef6c38 SHA512 fb0d56f78ac8c5f621fa35e2d408eae4f816113250ac6025a150e0f7b0402580e6924c52751bc0d093fc14bdcbc39af203c0e9ad0dc60d11190f068577e9c6c4 WHIRLPOOL cc0f414cdcb71dac4f2c6e636e3e219ad01880baecbc09d79ea4e95941186f4a35aed66805f2b06362d3142679541b3af8df0b66ee71683eab20079ef36dc257
 DIST genpatches-4.1-42.extras.tar.xz 16420 SHA256 e8d9995830a65146198ab957a95b3d5397155b56150884ebe8897a7a1dc2b072 SHA512 0212316ca623b87ed9c3154107ea246e452709cd48572882af7be0ff776cf3aa978521ee4c7c82e62d4d3cef5412bae4f90def577b841f61fac529a317aa8106 WHIRLPOOL 6b9188a4007020125e5bce136273b1e9262ae8f863905fc08e7ac3a1b41848de11b54dd6426c3babd8e670997bc1c0aed8073800bb04ef5fa4242e350d2b0572
@@ -85,33 +50,9 @@ DIST genpatches-4.4-28.extras.tar.xz 16360 SHA256 6c1331851468c372e7f9ea2c456b45
 DIST genpatches-4.4-30.base.tar.xz 823044 SHA256 9c57b8bd64b62a4bf24f8fde252d5bdaf44c3ae86d759836b9ecd46eb1f6bfb5 SHA512 f50d16367d433b8118082dc1c7e23df1109c52065b09287bc70bd7d811f2ab000a94dd4f62c89a7617417d8d0df65cd2156cbd209687ec42be62cb7a36c5d569 WHIRLPOOL 93a2d5dc5da2eccb39c3552b5d56abbf93b1c72936e6101d9d0538d62c01c1452152cf8e7205b7c6391dd258388d469b9f0ebd0ee6c9ed0b95e2d65eba4ef3da
 DIST genpatches-4.4-30.experimental.tar.xz 87764 SHA256 284dcf0dc30a5845f5a9c82f2130ff4b196f8c92923a6b6053a7d40010b45848 SHA512 cf74e739520ca8f4fd7108558bd581f61bfd7b73d94dec699d21ac53fddddac657db0994c5e71017c1cc079855d2699798489b7ca899f904e00a3753c5c154c5 WHIRLPOOL 96a94e53cba14b6acb44e1c67b92d8cf20b7fde0a46e99f9cf896c6ff49bb7c2e9682aec46a5e93f2d8c63790ba9817772f0258dbd4a0f85b215d4876e277bf3
 DIST genpatches-4.4-30.extras.tar.xz 16368 SHA256 5ae402de247df572e8ea70d8ef23808b0c162cf31d4623327897ae54933adbf2 SHA512 edbd39ca766fc808ac34f868f28b05a0f8275fd5d1e62c8036d5204bfef34694383a07925c3b589d32d5f8ed8ac43fe1391d49071f02d7ac33bdd8249fad6b58 WHIRLPOOL eee136234d33cb39f5956e003eac9449889227f82a17e137dd8dd22a6dd8dfe7adaaaae4973bded4d0130771465aabf4c35b6e69220d20a9b4a002a5a93165e6
-DIST genpatches-4.4-36.base.tar.xz 885164 SHA256 57dda7bc44a7443db8c93a97db4c96e25e4e4f154e1f57c33ad2c71f71f874ab SHA512 44dc33ca4d977d0313f9a5a9ca96522bf4e8d0389a50ca9013f4bcabee5b7fe9587a75e0c121984459dbae19c4648dee71e79b6f3add8bc1e2bf9e77ce2da3c8 WHIRLPOOL ec0a292e5a14e8d7d298d05b5bd9f3dd2a81536ad5c2578d5ce041e3786af795aaba7e3567d1e290dcd57570acccd1c86311cc60bc25c259ef0fb3e62a848964
-DIST genpatches-4.4-36.experimental.tar.xz 87760 SHA256 4f46c90e7f4df95d2c83de8b08d52ca831dd269ec0c81103a46846dc92bfe9b4 SHA512 b508fbb7a57542085dfe4f37b52ed0ff7e53a5b516db40360eefcfa556c6ae7b7813b97e6fa8175be82007696ff586eb6247a881b794eadea15fd7bf0fa705ac WHIRLPOOL 228c1ab3b5ef249362c3a92ecce3c86918fcd0b89bb44cf5f564cfdd4345ee600bd0a5888ee341d39e5424e356d07a8cc4125bb3bda2831d9f04df3c6221035f
-DIST genpatches-4.4-36.extras.tar.xz 16416 SHA256 313b4322ed7fabb9067bd0d5c20e67b4ab7cdcd59bd97c3b426161f305234271 SHA512 0f66916ffa293433a6e7737290b7032ed5272018d6f551c709f2986231810e130eb47290a1369df098d945e3805dbde06a756b6dd71525e833d9de9cbe34026a WHIRLPOOL d93a1a15bd3bb87821147fb24522485bc135557f668cfe31ce3cfdfe955ce733cc936f4f6f0fca02d73855d3214509ed0a4a13c67c25e87dbe3d9abc0c058ed1
-DIST genpatches-4.4-38.base.tar.xz 893240 SHA256 fb72de532c75e4d5d5d6de7bc479b458453a6d953291639178f0f01a6e3138e4 SHA512 91ab6916cb899b81bc5a001ef2a65134027834bc1b1dbd82acbc804be74c7872609c1f255ac4a10612801abc1d412d954ccc739284299b9d6f9aff19666dcbb5 WHIRLPOOL e11ca4e847590838d8613a456764ae56ec9ba55cb6bf173a9c3d7f53e998bd3ea7ffee8554b2ea4906a15d1ec65b4bdb16c1565e3d34ca48c52a268c8bd7fe76
-DIST genpatches-4.4-38.experimental.tar.xz 87784 SHA256 b565b3eee775d7c256f8ddefdc5e8c21c52e550e327cd41b417cdd8a060dbd67 SHA512 a92363efd9642417c384520045ebf92f588a13c8fd8fdc7d08933736f98d7496ce88619b340cf19c342df7439dfea9c980bc36947273cb3aa5ae804fa011c8a0 WHIRLPOOL 58012b32aba8cce88452ed9b53a18b9cd5a53d21a9c64f14da64dead9755b6756eac70f0baff8ed827159ed1b4edac88d6767c497e11dbe8ae10aabd1b011749
-DIST genpatches-4.4-38.extras.tar.xz 16428 SHA256 b60496f1217495d8ff3800deb49d305e534e9a73d1cd452748262e9f019488dd SHA512 9119130185fbb9b692de51baf99d1f6ac481e416bcdfeb3b1500d5275e82c92e4ecfb0745b9e9a3df8ee2c679dd240b317dadc3885689274fcbd5da626a31ac9 WHIRLPOOL 7d94404d7bf843045e2a7a1b9e2ddc0044c6e555186fdc4d5e9977242cb5a9bd31514b1202732e18c6e823406807083925ca7f31ee523c0771e8c19224567ac6
-DIST genpatches-4.4-39.base.tar.xz 899828 SHA256 527ca060a613235c8e991bc1556d1fbcefe61f76121e8911dabc0627ee6c474a SHA512 5ff2f81d6bcf7f1b0d5e768f3c440c00e60403a95ea7fceba56ea4d77f2cf230cec22b5856a53d3105fb0ba1c95eb4854bc69710b1094f0dd411edc1dced2921 WHIRLPOOL cffa9cc9d3f149e42dc06ea2b31e20cbc7e9e5f5652a081da4bfe59e82c876f66ae54916b6d885452037d578051c3888d1bdd940a193d4c5520132ee99e709d3
-DIST genpatches-4.4-39.experimental.tar.xz 87784 SHA256 9331896942c0fc5c87f05405db8205768b7b20abd5780095be6d608f32147e1c SHA512 17298c94b0a76066f520a76f48e88e706e1ea2d0c874d4523ae1332cbc4d4a4a007a3e0b183e54f7051c532a3755bd576d543bc7fab42a2ad57d3f38db9566bf WHIRLPOOL d42d9c42a7f881b91f380a43b693d5d8ae063a3b45cc3111dc9ade59a49e94381b7adccb1c13b9e70bf9b06194685289ef93968f780a98c95951374e1f7f7ad6
-DIST genpatches-4.4-39.extras.tar.xz 16420 SHA256 a1ea4470421a41f0020f226b90af23c0ea611841491332b8fa69ff4d8e78fc1a SHA512 a31a8cbc4f0292b791c9918ec0912625c320b8f77360f2d2daa9a1433abbbc6e55003b1cdd6ad3fa95311c1836ed99307316a29954c2df29f1ab7b1eba02d041 WHIRLPOOL 76aa5dd008ebbd1ea898e3be385225a959980725b8779e1f78d7aee213c3369b035e0fe1917462e49150343823deb59b90d7c869be1599238602276465e2caed
-DIST genpatches-4.4-40.base.tar.xz 900384 SHA256 37e46efeff392dc9e60529bcb5968d41509f7584c2452837c1aeefce8aec433e SHA512 630979a3e8366025327961d8b83d7558f57dc8646de1dbeada48bf746a32c238827a9038861d72a7747ae78aa1eb5739ca2d87245ae2528e17dc57295e9b4dec WHIRLPOOL 2a1082442dde035407d918fff833ec0585d600490d700049951cb6c50eae543369549aeafaf159c69bfc1789b965f3a43cb1920747ba8dafbe45ff36e0e7e856
-DIST genpatches-4.4-40.experimental.tar.xz 87796 SHA256 88cc5074b3365417f97e319fbfe7bf3b4dc0af2cd7ba7041a09c13b1799f51a0 SHA512 f050858eb451258002a56fa2ca5e659724505a32aae5a8f7f0aed80dfbbcc681ac9e08eaf20dc963782e64d77938d255472a97a9a14d9682aca824b4ca6d66ed WHIRLPOOL 0c7e385760c343d4e00249874c32fda40970d3c79bd4120efd01b54a2ddfee429f00a14a64b7e91eab4d861b984b126c5b8ef7ba903e944fdca1ee64a54b412a
-DIST genpatches-4.4-40.extras.tar.xz 16420 SHA256 e8d9995830a65146198ab957a95b3d5397155b56150884ebe8897a7a1dc2b072 SHA512 0212316ca623b87ed9c3154107ea246e452709cd48572882af7be0ff776cf3aa978521ee4c7c82e62d4d3cef5412bae4f90def577b841f61fac529a317aa8106 WHIRLPOOL 6b9188a4007020125e5bce136273b1e9262ae8f863905fc08e7ac3a1b41848de11b54dd6426c3babd8e670997bc1c0aed8073800bb04ef5fa4242e350d2b0572
-DIST genpatches-4.4-41.base.tar.xz 903076 SHA256 2fc1ec72c69851617430b023ee34e709e3381d35b9e9d8a304f82497fa9b122b SHA512 756cb5f4dd790338219d753721805b178838088cf9fb283971b0de17f3f25e5503cdde3c7f12d6dc9ffaffcb6280335c7bee16027adca8a95ffb63482575c6b6 WHIRLPOOL d662282e974f1fca142b85518df2018fb6572df6f642600eb7136f02dcc77acb3b2e519387c8979a3ae55cd05a9f09f04dfb5739186ebccb42d33e3b64492982
-DIST genpatches-4.4-41.experimental.tar.xz 87756 SHA256 7e0a05f5392ea0a0a773ba6a213099fb5e5e7f160d0e97e5efbef75949634edf SHA512 bc4f6c73042af681216df63ec45163cefa59cbd2a7c856d0eb5432e4d4b8c274fb2459004c900ff401e90c691cb299c20a0a136766eaa7155dd9af8f9ba28c7a WHIRLPOOL 910d1607f6b588433e50a6645e7d947b73a5f92f9fc1ce8d3c4335d59f9b7009a1048475da411ea8613d1614cf2aecd447fa160cce4a0d8c54544444ee746381
-DIST genpatches-4.4-41.extras.tar.xz 16420 SHA256 3bb432cefdaf61a4777e2fecea0e668605c6cdbdba723fdf396953c5beb94ef8 SHA512 de4ea7d47034a32ad3e3013d23d841d2112719016e6789b1b4d2821098b0adb8ddf9b97e53c3b605bcffa1bed9c2ad86decd022813f20a6d60bd06f469019993 WHIRLPOOL be0df2881d58d62d2d11bfc1387b0bab69565a82b19e52aec7d9c3dd3f1919c0555ba70e6cac8b7100e949797216a875cec6075e5cc334d4322a28d539722ab4
-DIST genpatches-4.4-42.base.tar.xz 908736 SHA256 610f87d3c2ce53acd1adba1e9a922bbe94a6eb54689e095ef6f7299d8c58ea53 SHA512 830602f5a5311247f34d2ef26d86dbf627398c14fcdd128c748794a1f9263a5a9f684e9e6f983dd09e40c9e82ec9a73ea4b956f97a930c6a5ecebe722b7ebbcd WHIRLPOOL b3e667cf05be37c3c8cd5897096dbb092ee03e25a62aff2d02548fad2069e17610f6ba4bf3dd7fe1af29e1451730da509bc6b5f081ea5825735be07b0630b24d
-DIST genpatches-4.4-42.experimental.tar.xz 87744 SHA256 749b7a4e994375f6b9f01d63146cd3ec05152f3b3bb90ba7ad75f22da7ba7622 SHA512 ef0ad1b3eb66b8f527465c99d45686fd5f22c959d94808c553f056411489afbabe0ec36712e17504ac88f1e8631765a9c8a5b72abe7661f4f25ab6b2bdd2d414 WHIRLPOOL 1780d0bbf90ecc698c126f7ce0afebf2618ef06e61f6568daed4be7b8b060885e2a8f10e9391d99065e7d093f9c288113e72dd0659677488249b4319724cd83f
-DIST genpatches-4.4-42.extras.tar.xz 16416 SHA256 216f4db97151886dbfd2e210c6c6af901dc5e73c1ee6a5947cde200a20e64de4 SHA512 aee7be96cbf828239f12c7167ce9cc264b964e71a4a81d9b81afbc5b8db6cc7b43534ebcd4b3154c3e060a6920d62de8b2fae7ae590a5000529ac31d682c78fc WHIRLPOOL da346249341bccf50541e92005d6306010cd0fe365e61096fc6a1691cd19ad2719ad11f362036cbdff84dace4128b98dc2ba3d3353b789b04d9912b7b28033f3
 DIST genpatches-4.4-43.base.tar.xz 912072 SHA256 f7c9220f08385e8bdcd3cc42974581c259209aaf61fab1c3535e71a37e7fcb6c SHA512 3e84797279583fbe5e3031bef8c3a734363c2aa41ddac266d51871d7885293c1dd63a64f4cfbf0c06cb35420c3f66e84fb93dc5d1a4ea2cf0c63db43605054aa WHIRLPOOL 7b4eb188985fecbb1561cda8e2a78cd01f3695b198efa288482d432392b3a3d5c60fb6c5d6a70566ae4e929793ff967fef56fdadbdcab22426b328463756345d
 DIST genpatches-4.4-43.experimental.tar.xz 87780 SHA256 534a3f534991a30ed827439a943507610af2a3063e1fdf04a312e53ffc2cc120 SHA512 37944015c17ca4ffbc09532980c78011b4e18cab22a83e28a052ba5708c9a560220ad84a445469165a4cc1e955c60c323e3cb52c3cdbee0d9c9bb1766c8638d9 WHIRLPOOL 0f52497cf2ba2d58c2cd7e84787df2bafb2cfa470c36421d72c4269c9f7f2bc856c611dbcc60e825ed5bebddd1de04adb1fe15893e7a1fb6fc9409e1b16ea34a
 DIST genpatches-4.4-43.extras.tar.xz 16420 SHA256 edccb4cc994f3a80f3c8e01a0824038b2e0fa38572833027f6161908f2eeb739 SHA512 776451ecdbab4c28697549536224824c41e4d903bc3ea6fe5eee9d8b747bbac7343b56daddd7ab23bd2d35482e31e0f411dd60fa2b174112bee2fb75b07641c0 WHIRLPOOL 59ccb8d8254c1dab01c47bd6c312f442eefea753d1e7424b7b052ae6d652c2be076380406e6250e536cac49233c665955dbca085cc6b12276b13537cc86e69c7
-DIST genpatches-4.8-14.base.tar.xz 248780 SHA256 abe559e7a15d2bb125811ef28d455baca07092b6af93943803e1079f4d4f6fbc SHA512 4a30f10dcadb47cd02e4f4992ef7f7d221872e03c254751320bd9977bfc59eb27321a02cec6dae1bacebe734adb3d04d022ea019c30f75b943f65f9c0dd49ea3 WHIRLPOOL 77bd42de19550647fbe6c22804a0dd71455f006055dc8c7f5fcc9257e4052b42293a3933dc71400bea198db50656747176777d94c40ef3926100075fbdc6d383
-DIST genpatches-4.8-14.experimental.tar.xz 92004 SHA256 0e574fd254afead4ba164f40fec008f069f78f94100cb04f44b5a313906e8ecb SHA512 fac626c3c4387ab9121de9b10b5fc8753991a326c773d243bc2f7d8c4833d83864458036d3adeed6cf7f7f3d0fb846cdbff707d55d216fe5232e5c842ecdad36 WHIRLPOOL 26c0c1e9a6a840e32d533c7eb4492679f5452ec36b8fbae043b0f7888af71386bb5863c2dc46e299e6f8a54c2cd5d451cd4c71945d6bd185403c11f838ad8d83
-DIST genpatches-4.8-14.extras.tar.xz 17308 SHA256 c64cdd104354fa9d5cac6fcb543c164433cc5abc2f5d85b868bd60464213c83b SHA512 0befc3771ec97707673b94a9183d8969a9f82dd7ec89629ea62dc6d21b023239358ac31cf96f1ef09ae329cde68db45170156d8caaaa29facccbe290521c3601 WHIRLPOOL 61cc5e3d5e69d02716507e10800f41742c8f1de744a8b9e9d2308692890b98292ef31487e0152e1ff24848f81504e5b60a98f89c840bd1a76ca049c487c0bab6
-DIST genpatches-4.8-15.base.tar.xz 256616 SHA256 8e2b0088ccc69454f516d7b2ab8799367c1a58f8966ec047c1376e80d82733bd SHA512 22ac9ce0565b2c8a8559cbb88aa42a2a6f6b470e8ce5d55c409b1fcb802e293e21e93dc8b4903033b87867913e833188d204962b4439000af7ea3af438ef1b85 WHIRLPOOL cf99a52d2e9158ba2d47704bff500c5c806afe723dbe7f4ad1aee8132c95760c2d70a95890a9ede777364971943bc02ce4bca194d010ee488020a53b23a194d9
-DIST genpatches-4.8-15.experimental.tar.xz 91972 SHA256 eb971ac227b0849b7839df5ea30745284cae242010b5a7fce7af675f6b371bb7 SHA512 3a5aed0e619ceff2b3363fcf08c331924508abbb2eabd6a05f32e1cdb681116ec3f5e27bdbec7b11ac83a45583f671f2d58f54f98161f4b9c6393392dd6f8d9e WHIRLPOOL 5ec4d9982c85632f30fea693ed7a3d65fce408ccd80bc8815b78a76a915152c30ee9b48338f4b15019fad4f54d983f6578f316dd28be9d562a4abebb89b613a3
-DIST genpatches-4.8-15.extras.tar.xz 17316 SHA256 c760ecc18f8ddab5d6bc71edea58e1bcf0c6b1be6f448ccb5f572c2e02234961 SHA512 6f5e51d921c340f2ee6dad1141f5d01f7d1517dda11197510ab2ee2cf64ac0358ad0ddbd5ce8935885086a4580df4de6e908ecf2f73998fa388b59a71bea0c02 WHIRLPOOL 1a8399cfd39b38553cf6e26b3e6112c7dcbc2a9189eff724fa931f5ae634fc321860d9cd344936fda584753407ebab7018d597790ad93775dbfe5799d7e31ecc
 DIST genpatches-4.8-16.base.tar.xz 268656 SHA256 1436e623bd2296cfe1976e307cadbba1e9b2ec9d50211c7f9e832fc1b38f9e0a SHA512 f992bc50f706c2fcdc68c731dfc3965ba11c13426ce1437dd3277b82d1824681ebbd07a6350e13be453e5154f75e291129d09bdc0ed1ed0457b290cbf5aaa999 WHIRLPOOL 7eca460ed8a6c53f425f4ba1adc869beda4eee64847b4fe5c0576f90440d8a53f3ba98334f7170e83cb975525b091df88ea8e7cc9099ee7edac2e30e93b089b0
 DIST genpatches-4.8-16.experimental.tar.xz 91992 SHA256 38bbf0e911602baed1ef7f749626d4aa156f7c1100503388f7ef1c670b21c657 SHA512 94719f52e70753ce6cf60286fb03689be798fb77dc73e900bebdfc67170fc2154ba3432ae757b9f12c5e2ab5cac38b627c099dda4fe565a9a5b1297ddea18d48 WHIRLPOOL 6197840e8eb9e22fec0d3810b1e33d9fd4ea861105166b8a649cd03debdb17b4d00aa4c595412f5b99d04c1fc70df30d83c7df0f3eddc4de4b4cfc96ee733386
 DIST genpatches-4.8-16.extras.tar.xz 17300 SHA256 6e5e1a38ec23e71e8b4a2c385c1963fc5fb7d94efe36d19695c9eda769c8d9cb SHA512 0dfed59c281ea1ddd2074bfe3d68a37afc31e44bab721cb3aced63267bc5a74d4cb60c77d15abb2dd0c57f49f65e742f9fe400d2bc3f709ec3ac598195730332 WHIRLPOOL 6683ae446c09b92afe09d07581ac7dcfb112a29d311a4d4ca657ac4a86a56a4817331da3e78d3d1683cded44194fd380835b7d8184e6adbc6203570472417096
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.101.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.101.ebuild
deleted file mode 100644
index 70d0d2554c49..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.101.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="106"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.102.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.102.ebuild
deleted file mode 100644
index 28957adf9f0a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.102.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="107"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.103.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.103.ebuild
deleted file mode 100644
index 3944e64df98c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.103.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="108"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.104-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.104-r1.ebuild
index a2979837ebc1..7215f017d293 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.104-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.104-r1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild
deleted file mode 100644
index ae8b6bf928ca..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="62"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.66.ebuild
index 0391e88de6d4..61fa236745c2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.66.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.66.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.67.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.67.ebuild
deleted file mode 100644
index a83f6e0f133b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.67.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="64"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.68.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.68.ebuild
deleted file mode 100644
index 7f1d9e08312c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.68.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="65"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.79.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.79.ebuild
deleted file mode 100644
index 2a77b6ca0288..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.79.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="86"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.42.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.42.ebuild
deleted file mode 100644
index 1885e34c6b63..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.42.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="41"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.43.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.43.ebuild
deleted file mode 100644
index 175365d4d272..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.43.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="42"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild
index dd43a7fd1484..cbcf66f974fd 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.45.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.45.ebuild
deleted file mode 100644
index c989dc4eaf41..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.45.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="44"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.112.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.112.ebuild
deleted file mode 100644
index 0bb4cd602915..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.4.112.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="95"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.36.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.36.ebuild
deleted file mode 100644
index 7c6de9093f0e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.36.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="41"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.34.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.34.ebuild
deleted file mode 100644
index 79cad63b2f20..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.34.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="36"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.35.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.35.ebuild
deleted file mode 100644
index 739efea917c6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.35.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="38"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.36-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.36-r1.ebuild
deleted file mode 100644
index 807e38b715b0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.36-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="40"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.36.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.36.ebuild
deleted file mode 100644
index ad8f81d4460d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.36.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="39"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.37.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.37.ebuild
deleted file mode 100644
index 7c6de9093f0e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.37.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="41"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.38.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.38.ebuild
deleted file mode 100644
index 1806915b80a8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.38.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="42"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.8.12-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.8.12-r1.ebuild
deleted file mode 100644
index 771ef1f3bde3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.8.12-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="14"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.8.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.8.13.ebuild
deleted file mode 100644
index 3a3e3608c2e6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.8.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="15"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 4e258702a468..6165ca71af51 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -15,6 +15,7 @@ DIST hardened-patches-4.7.10-1.extras.tar.bz2 1941100 SHA256 8a7787da2d440308b28
 DIST hardened-patches-4.7.6-1.extras.tar.bz2 1913657 SHA256 f32b7891fa0a821a60270f42dc817135d887ea55bda676e1141f0681ff360374 SHA512 943b25c12071abab62a169a2daf6e2255c76e595678a2553eaac4b87f2f227f0bfc47daad246db9b002119c6be3ec56e8746a7cb598a29c8772b3de4f7601519 WHIRLPOOL b1f5ddadf8d0387ade037a4b3f0e7e001971b01584f03ec40e61dda2db1e5762ac66266f00f5d95226337347dd9ed43c1d019a65eb66780403c81348bfc4682d
 DIST hardened-patches-4.8.13-1.extras.tar.bz2 1917752 SHA256 98cec4effe8c5494ab88d24d36af23f3ab244a0872030903ef9e21b6bbf2cea1 SHA512 9d5fb8c2faf4f338662815d5bd129966d2e28e4b77502e26c7af097a27e168346c86e67755a3392b5b6a8ccdfa6bd112cccc89cf3d4239361815dd723c220fda WHIRLPOOL f12bd2928a8fe363842310ed110ac9db4041730bc56da1d224ba0ae457bd8ca2763909e4edb27823bf9d2b14c7d6045c53db65cf65eb970fdbe58665f07934e9
 DIST hardened-patches-4.8.14-1.extras.tar.bz2 1931192 SHA256 eeefb512eab30d6c914edbed239e2cb7caee8e37870d3211abaf23912ee6bcd6 SHA512 7c18681a8da841a71e97c8f965ea73b62dee496fb3f213b25599fcc92184d545ef3e97c0564043ff63ee80f8dd90466188a3b33e437214dbbca9c6a15993dd81 WHIRLPOOL 8b01a9b0d78a6650e8a6a86b9638798abdbce4efe85e70adfdd7f40e3d32b452a481a75f2039b58c74f9b3452609bfe2a757de7a15c708e3e1f5c94378324a4e
+DIST hardened-patches-4.8.15-1.extras.tar.bz2 1937990 SHA256 aa4effb3c0a9f6fc586e8eb1b67142bceaa5fb51890d13ecc936d7add93f8668 SHA512 9fcb8d67303db5b11f046ef53f9236e4e28a766e1715218330a21cb4cfe21f6940e4c23c7fbba3e6dff9da6e4c46c5be9ac88f30f5a87cf0d6fe7ba12469670b WHIRLPOOL 02a3e22279d7b85b452aab4213c82b47fa55d85ba1c2d4b1ec420a7ec1487d0a64da180527a5b8234e48108f6d7a615e8f29992c17a113158e8524ca9bbfe700
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
 DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.8.15.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.8.15.ebuild
new file mode 100644
index 000000000000..3eacea89ad95
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.8.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="13"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+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}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.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-3.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-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
index d146f00dcb3a..3a713ddd1461 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
diff --git a/sys-process/watchpid/watchpid-0.1-r1.ebuild b/sys-process/watchpid/watchpid-0.1-r1.ebuild
deleted file mode 100644
index d8db315a7ebd..000000000000
--- a/sys-process/watchpid/watchpid-0.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Watches a process for termination"
-SRC_URI="mirror://gentoo/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://www.codepark.org/"
-KEYWORDS="x86 amd64 -ppc"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND=""
-
-src_compile() {
-	econf || die "econf failed"
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README AUTHORS
-}
diff --git a/sys-process/watchpid/watchpid-0.1-r2.ebuild b/sys-process/watchpid/watchpid-0.1-r2.ebuild
index 3cbda3f2f76c..e7174d960f4e 100644
--- a/sys-process/watchpid/watchpid-0.1-r2.ebuild
+++ b/sys-process/watchpid/watchpid-0.1-r2.ebuild
@@ -9,14 +9,12 @@ inherit multilib-minimal
 DESCRIPTION="Watches a process for termination"
 SRC_URI="mirror://gentoo/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://www.codepark.org/"
-KEYWORDS="~amd64 -ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
-IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+DOCS=( README AUTHORS )
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
@@ -28,5 +26,4 @@ src_compile() {
 
 src_install() {
 	multilib-minimal_src_install
-	dodoc README AUTHORS
 }
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r1.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r1.ebuild
index b253e9e838a9..019e4a57abdb 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r1.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r3.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r3.ebuild
index f599413662cb..04a3dd5462c8 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r3.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r1.ebuild b/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r1.ebuild
index e9b805433b0c..cb6fcdd2cff5 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r1.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.110.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 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=""
 
 DEPEND=""
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r1.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r1.ebuild
index 0bc5a365f24d..22c7394e7bf6 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r1.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.950.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r1.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r1.ebuild
index b253e9e838a9..019e4a57abdb 100644
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r1.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.200.100_rc.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.200.100_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.200.100_rc.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.200.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r9.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r9.ebuild
index 88f9a8104788..2bc997508c88 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r9.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.230.0-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.40.200_rc.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.40.200_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.40.200_rc.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.40.200_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-File-Path/perl-File-Path-2.120.100_rc-r1.ebuild b/virtual/perl-File-Path/perl-File-Path-2.120.100_rc-r1.ebuild
index 0c87ab865235..2ce09464c395 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.120.100_rc-r1.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.120.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~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=""
 
 RDEPEND="
diff --git a/virtual/perl-File-Path/perl-File-Path-2.90.0-r4.ebuild b/virtual/perl-File-Path/perl-File-Path-2.90.0-r4.ebuild
index 31a4808d00e4..d2659373e813 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.90.0-r4.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.90.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~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=""
 
 RDEPEND="
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.560.200_rc.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.560.200_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.560.200_rc.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.560.200_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.54.10_rc.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.54.10_rc.ebuild
index a5a19ff2233f..40e1e5ef26cf 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.54.10_rc.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.54.10_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.68.1_rc.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.68.1_rc.ebuild
index 94507bf74591..0e67518a68ad 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.68.1_rc.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.68.1_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-IO/perl-IO-1.350.100_rc.ebuild b/virtual/perl-IO/perl-IO-1.350.100_rc.ebuild
index dc0e4e7f5f62..a315af9f0ee2 100644
--- a/virtual/perl-IO/perl-IO-1.350.100_rc.ebuild
+++ b/virtual/perl-IO/perl-IO-1.350.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r1.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r1.ebuild
index b253e9e838a9..019e4a57abdb 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r1.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r1.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r1.ebuild
index b253e9e838a9..019e4a57abdb 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r1.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.273.0.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r1.ebuild b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r1.ebuild
index b253e9e838a9..019e4a57abdb 100644
--- a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r1.ebuild
+++ b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r1.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r1.ebuild
index 96a856c82bf2..166636873b4b 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r1.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE=""
 SRC_URI=""
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r1.ebuild b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r1.ebuild
index 39c3dfc32808..fcca9fb87853 100644
--- a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r1.ebuild
+++ b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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=""
 
 RDEPEND="
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.610.192.200_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.610.192.200_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.610.192.200_rc.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.610.192.200_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r7.ebuild b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r7.ebuild
index 5bb203f2dda9..3e63fa668a5c 100644
--- a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r7.ebuild
+++ b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r1.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r1.ebuild
index 20e3a71c2e7e..07c6e3bd326e 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r1.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.430.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.100_rc.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.100_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.100_rc.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-Safe/perl-Safe-2.390.0-r2.ebuild b/virtual/perl-Safe/perl-Safe-2.390.0-r2.ebuild
index 40a586a0c073..d9688f409ecb 100644
--- a/virtual/perl-Safe/perl-Safe-2.390.0-r2.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.390.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 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=""
 
 RDEPEND="
diff --git a/virtual/perl-Storable/perl-Storable-2.530.200_rc.ebuild b/virtual/perl-Storable/perl-Storable-2.530.200_rc.ebuild
index 2cae5c9aee20..1c420d15c5f9 100644
--- a/virtual/perl-Storable/perl-Storable-2.530.200_rc.ebuild
+++ b/virtual/perl-Storable/perl-Storable-2.530.200_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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=""
 
 DEPEND=""
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r1.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r1.ebuild
index 2d718643b8cc..b9f15e6cc8e3 100644
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r1.ebuild
+++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.100_rc-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.350.100_rc.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.350.100_rc.ebuild
index 3afbf4a0fc4a..319fc8db6a37 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.350.100_rc.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.350.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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 ~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 ~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=""
 
 RDEPEND="
diff --git a/virtual/perl-Test/perl-Test-1.260.100_rc.ebuild b/virtual/perl-Test/perl-Test-1.260.100_rc.ebuild
index e939f05611e8..039471fe73a8 100644
--- a/virtual/perl-Test/perl-Test-1.260.100_rc.ebuild
+++ b/virtual/perl-Test/perl-Test-1.260.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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=""
 
 RDEPEND="
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0-r2.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0-r2.ebuild
index 56682acf22f4..c2aab6cc7bf8 100644
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0-r2.ebuild
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.50.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r7.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r7.ebuild
index 5bb203f2dda9..3e63fa668a5c 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r7.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.120.0-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r6.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r6.ebuild
index 5bb203f2dda9..3e63fa668a5c 100644
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r6.ebuild
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.290.0-r1.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.290.0-r1.ebuild
index fa6869df6235..d3efa6b0388f 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.290.0-r1.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.290.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.200.100_rc.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.200.100_rc.ebuild
index 13d5f3403824..3f253a2453c6 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.200.100_rc.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.200.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-bignum/perl-bignum-0.390.100_rc.ebuild b/virtual/perl-bignum/perl-bignum-0.390.100_rc.ebuild
index 80d42949fbed..7b433ed8f212 100644
--- a/virtual/perl-bignum/perl-bignum-0.390.100_rc.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.390.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 
 IUSE=""
 RDEPEND="
diff --git a/virtual/perl-libnet/perl-libnet-3.50.100_rc.ebuild b/virtual/perl-libnet/perl-libnet-3.50.100_rc.ebuild
index 2a5d70ec30b0..bcc5e78dc63d 100644
--- a/virtual/perl-libnet/perl-libnet-3.50.100_rc.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.50.100_rc.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-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"
+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/virtual/perl-threads-shared/perl-threads-shared-1.480.0-r1.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.480.0-r1.ebuild
index 39ca3fd0991f..4c445860ddf4 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.480.0-r1.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.480.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-threads/perl-threads-2.10.0-r1.ebuild b/virtual/perl-threads/perl-threads-2.10.0-r1.ebuild
index f2fde53e8e75..c2b545ecd6f4 100644
--- a/virtual/perl-threads/perl-threads-2.10.0-r1.ebuild
+++ b/virtual/perl-threads/perl-threads-2.10.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/ruby-ssl/ruby-ssl-7.ebuild b/virtual/ruby-ssl/ruby-ssl-7.ebuild
deleted file mode 100644
index 78b367588dca..000000000000
--- a/virtual/ruby-ssl/ruby-ssl-7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-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"
-IUSE=""
-
-RDEPEND="
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[ssl] )
-	ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] )
-	ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] )
-	ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] )"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
diff --git a/virtual/ruby-ssl/ruby-ssl-8.ebuild b/virtual/ruby-ssl/ruby-ssl-8.ebuild
index 3173335b116f..d5d9e4fa8956 100644
--- a/virtual/ruby-ssl/ruby-ssl-8.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 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=""
 
 RDEPEND="
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 0cee53d69dd7..5ac7eadf7272 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_56.0.2924.21-1_amd64.deb 48420232 SHA256 1525e1457bd44267f904a8f148a0b0f894ef7dd95fa9e51f502b7835b7ac9467 SHA512 e74c0dee25484495c356ad0fbdc8cb4eae96a4ec3433be7deeec27f07c6d8120c1d41e673dd91e9e33fd18f5d8f49b6ccba9ce4affc8baaffda5e24e3c0d9591 WHIRLPOOL f0bd2029b5fb9fd912a9fd86d76a78c5bc92b22c465f1a99c373cb42c070ba3b2cd5272d92293ae7ee2d1063cd5bbb5a055fc3e112ce403733d2965bd0d9e606
+DIST google-chrome-beta_56.0.2924.28-1_amd64.deb 48471026 SHA256 08c9c14a0f3e72e2b944173fa9525950999c6fd7423a69333bc25c6d489135df SHA512 3687972d48ce6ddf0b05b95b45e8468f896f3361420aa522d08b32823bfcccdf8188fd1457e1b98e8db053c507c4dbecc07f69ca8dec9017d63d787f8e1e16ac WHIRLPOOL 52235a79ead2a899d964164cc7af6ada7b533aa6650431a05a9b8c6c06b12fc16c7f8f84b513fe3c5293c6388a49bc98fb837f4b002bcc771171d345f3537fc1
diff --git a/www-client/google-chrome-beta/google-chrome-beta-56.0.2924.21.ebuild b/www-client/google-chrome-beta/google-chrome-beta-56.0.2924.28.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-56.0.2924.21.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-56.0.2924.28.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 14f24b23e1bb..4d03a101ff3c 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_57.0.2946.0-1_amd64.deb 49317186 SHA256 48c58172ee3c62b2bd6f6223ade1730697baeaf2316d206ed81d8108f48a9695 SHA512 38272c6087f2c19c2b2b0a126402b3128b32266bbdbae124e1cff9ca5077c9a9b6b4cb63e791dc64e074028be0925b977fe2c86081033cead28e8b167fc83987 WHIRLPOOL 7cd5eeede01eeead578f4f9900d3cbc442abdfb807487efac1589792ac9e623a474643e86f43f93a0abc596adeaf728f594319be150b93b540d03e2e1e42b5d1
+DIST google-chrome-unstable_57.0.2950.4-1_amd64.deb 49294886 SHA256 7fec3a15c53f62a66e89ee97489308235598acb887203f96ae556d2c9162d5c2 SHA512 a6b993247f0e5be288734b9d0032094f7da0116978a9aca86effa5c1a04c51233e86b00eaeb3d58763a4136f918e1418b42549f31b9cf9058e155c5d9f9839c7 WHIRLPOOL 68fdeb647745d30c232a81344b94737397b36169882e20af5a16df5dc6acd2c476b64ffc07f70dff32ea228e72d9d0f745a2265a9a0f2d378913d49836f97363
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-57.0.2946.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-57.0.2950.4.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-57.0.2946.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-57.0.2950.4.ebuild
diff --git a/www-client/links/links-2.14.ebuild b/www-client/links/links-2.14.ebuild
index 7268e43ce102..88585fff0405 100644
--- a/www-client/links/links-2.14.ebuild
+++ b/www-client/links/links-2.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 3e0945c1ab0b..0aa04a587aa6 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_56.0.2924.21-1_amd64.deb 48420232 SHA256 1525e1457bd44267f904a8f148a0b0f894ef7dd95fa9e51f502b7835b7ac9467 SHA512 e74c0dee25484495c356ad0fbdc8cb4eae96a4ec3433be7deeec27f07c6d8120c1d41e673dd91e9e33fd18f5d8f49b6ccba9ce4affc8baaffda5e24e3c0d9591 WHIRLPOOL f0bd2029b5fb9fd912a9fd86d76a78c5bc92b22c465f1a99c373cb42c070ba3b2cd5272d92293ae7ee2d1063cd5bbb5a055fc3e112ce403733d2965bd0d9e606
+DIST google-chrome-beta_56.0.2924.28-1_amd64.deb 48471026 SHA256 08c9c14a0f3e72e2b944173fa9525950999c6fd7423a69333bc25c6d489135df SHA512 3687972d48ce6ddf0b05b95b45e8468f896f3361420aa522d08b32823bfcccdf8188fd1457e1b98e8db053c507c4dbecc07f69ca8dec9017d63d787f8e1e16ac WHIRLPOOL 52235a79ead2a899d964164cc7af6ada7b533aa6650431a05a9b8c6c06b12fc16c7f8f84b513fe3c5293c6388a49bc98fb837f4b002bcc771171d345f3537fc1
 DIST google-chrome-stable_55.0.2883.87-1_amd64.deb 46241756 SHA256 15e44458e0ff667fa0f97f6970df200daf41a671477f8a08cd18b5dbb64b77b3 SHA512 767a4651892dd86512e57235888281b8a0df14f843ffe9ac6144a5324896a8310fff99292b7ae72e737c91ca12178c61a8579106d17025bd288cf0cc43ca5d9c WHIRLPOOL fb68559e9189fbfa3bc564741be418fa22f1cf19ddd4d8448b03f29e35b5f4ea46a2d7241227b1150392e158fedf3980024e966bd37cc5e1201440019806c378
-DIST google-chrome-unstable_57.0.2946.0-1_amd64.deb 49317186 SHA256 48c58172ee3c62b2bd6f6223ade1730697baeaf2316d206ed81d8108f48a9695 SHA512 38272c6087f2c19c2b2b0a126402b3128b32266bbdbae124e1cff9ca5077c9a9b6b4cb63e791dc64e074028be0925b977fe2c86081033cead28e8b167fc83987 WHIRLPOOL 7cd5eeede01eeead578f4f9900d3cbc442abdfb807487efac1589792ac9e623a474643e86f43f93a0abc596adeaf728f594319be150b93b540d03e2e1e42b5d1
+DIST google-chrome-unstable_57.0.2950.4-1_amd64.deb 49294886 SHA256 7fec3a15c53f62a66e89ee97489308235598acb887203f96ae556d2c9162d5c2 SHA512 a6b993247f0e5be288734b9d0032094f7da0116978a9aca86effa5c1a04c51233e86b00eaeb3d58763a4136f918e1418b42549f31b9cf9058e155c5d9f9839c7 WHIRLPOOL 68fdeb647745d30c232a81344b94737397b36169882e20af5a16df5dc6acd2c476b64ffc07f70dff32ea228e72d9d0f745a2265a9a0f2d378913d49836f97363
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.21_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.28_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.21_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.28_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-57.0.2946.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-57.0.2950.4_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-57.0.2946.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-57.0.2950.4_alpha.ebuild
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index d45c34372f8a..c59f0e1cbac6 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,2 +1 @@
-DIST adsf-1.2.0.tar.gz 162753 SHA256 ba564c1da4a60c848dcb47fb3e003cbad0d2c6cf393c189f334b35e59937b681 SHA512 e195d36fee5900cfad08521cb511e0941078d46edab5c621d0ea0808fc9045e95ed634d171e8049dd649313b0c2b9e86f00a9f026943593292da57125e6320cb WHIRLPOOL e0bab5114801a30a33618c8cf310ec4d7808123179a35e31b414ff63ad6cfb23f7986f50dd5cf46208e938fbab5cb65b664553f030e6da5fd149dfb6b51ac0f0
 DIST adsf-1.2.1.tar.gz 162912 SHA256 247b5061f598d9271c05d59925ac9c4f04d879254570ffc0142a48c50e71615a SHA512 88cdc903f21bb3e86fbbfec88ae9650a4676d5d57c526befd1f483bb5281501f28e2ffb6fda8e2b06f891b8f4bbd15a3e6a1c90a96e3eef1c6b4a13a39f1b8cd WHIRLPOOL 335efd8f77ca5164f5b0e62428d737d6d7a4b590937c7aef765594cd7d3913a621bd757ad81234a2a303bf93a886d70eb8066f6c9c724042871bd4cf7c4a6109
diff --git a/www-servers/adsf/adsf-1.2.0.ebuild b/www-servers/adsf/adsf-1.2.0.ebuild
deleted file mode 100644
index 72344edeb5e1..000000000000
--- a/www-servers/adsf/adsf-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
-HOMEPAGE="http://nanoc.stoneship.org/"
-SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
diff --git a/www-servers/adsf/adsf-1.2.1.ebuild b/www-servers/adsf/adsf-1.2.1.ebuild
index 9edf94a6f56f..9e31e8b6b2f5 100644
--- a/www-servers/adsf/adsf-1.2.1.ebuild
+++ b/www-servers/adsf/adsf-1.2.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
 
diff --git a/www-servers/apache/apache-2.2.31-r1.ebuild b/www-servers/apache/apache-2.2.31-r1.ebuild
index aeab04f2c715..957fd0306bdf 100644
--- a/www-servers/apache/apache-2.2.31-r1.ebuild
+++ b/www-servers/apache/apache-2.2.31-r1.ebuild
@@ -89,7 +89,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 PATCHES=(
diff --git a/www-servers/apache/apache-2.4.23-r2.ebuild b/www-servers/apache/apache-2.4.23-r2.ebuild
index fce3d650e36c..32d81259bfdc 100644
--- a/www-servers/apache/apache-2.4.23-r2.ebuild
+++ b/www-servers/apache/apache-2.4.23-r2.ebuild
@@ -125,7 +125,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Upstream fixes
 SRC_URI+=" http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?r1=1751970&r2=1751969&pathrev=1751970&view=patch -> ${PN}-2.4.23-fcgi_fix.patch"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 14a7be261dba..237d54fbe595 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,5 +1,5 @@
 DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-FreeBSD-x86-304.131.tar.gz 10656712 SHA256 ba269b8b142429756be4fbf94a5da97bd039d6da91571bc7d4fceb750e0766ac SHA512 b8036055b5a667239b40392920a043b60b0d68529a85fec5779e9deca1bf2de8683be4e49aa7e37e1b32c547ff125d5d7df950ef059d26ebc28b244190062c59 WHIRLPOOL a8eea0d5ec4f1f931e2dc1b8f5faf0bea2b3db926b3c638e65504fdf9b3bbb2c27b8046cf859aa7f13f228cff4620d748b1cb6ef3fc8f8bfc2c650b0fe2419ad
+DIST NVIDIA-FreeBSD-x86-304.131.tar.gz 34782985 SHA256 d9d350de797d0db58ed82d73569766d8e914b0410f0f9fc78aac098fdcd31027 SHA512 45581bee7f9172ff3c45fd40a27ddc39b2fb32772706b769414c69f86b03eaed3fd9567e7e455cf2b3d330f6f981fe3c439f20f5be77b3116530f43daf4d17a2 WHIRLPOOL 50179ab5dfa900ae97aee0e9217ea78d2f60cb30d5f05fd9a21f384ee9376d1fefdf84aa5bdd997c2ea99188e7a22ce10dff1ae484f7b47954e0afb90b0c4f14
 DIST NVIDIA-FreeBSD-x86-304.132.tar.gz 34782140 SHA256 c411d1d290a8ed0cf379c8e18fcdc0934905d0762a52a3e2e330cbff6e8ef250 SHA512 fc23e02ca8c72b0cfadbfb9f08e26fa1ed6b2dcfc660b40eede718a44134dc7e75163c79319471c60ed7e7316405966ba132926f115c7241706936eb7cc6b685 WHIRLPOOL f23076cb78a79d8b38eeb081fc83a2fad163cad9d80f59d83e67d528ab7ecc3265809e032eb3e8a34533c825d420bc734149a29d21e1ebbe1f1787bfb923f5de
 DIST NVIDIA-FreeBSD-x86-304.134.tar.gz 35095790 SHA256 e7a164807c83ab0f1be98eb241e76db0ca481d24cd64563c44dfbd73b9067b0f SHA512 99549785683771d19c3877b6778f37622c9b7b3332bced2850f26476e21a258ead69535e199616940f40d4874aee2e8f6007b08c232b3ae17c5667a21c917343 WHIRLPOOL 85909e79083f1e9a87aa88801ab0ee855bd409bf667997037190b14923caee1e0bd53e8b180e54392e3f81b0cdef714318d699757a174c74d3ad0a0cfe70ccb8
 DIST NVIDIA-FreeBSD-x86-340.101.tar.gz 59992166 SHA256 f62038819eb4ba074e92ce8d26b6330ed3bc32d1c07bcc95f4e2964fa667e03b SHA512 b0d3e04acd60c1699850ecebbbdc2677f9691d3acf700effa369daedf3a45d7068c365a3298214acf396d7bcd531cfec26e9ef02e02c0896f01240219b338beb WHIRLPOOL 955e8ad5152137641fcf2d5515e8c3b0a7ed9cac5ab646c2551fb4b1b0c0295ef3e3007905d5b5f2c50daaab1b74b7d6ffeb3f96f617b464c2db745ca4b33473
diff --git a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild b/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
index d472f1e18d83..bd488ba109c7 100644
--- a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
+++ b/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100